diff --git a/templates/reset_password.html b/templates/reset_password.html
index 6fec7fb93..8e19831fc 100644
--- a/templates/reset_password.html
+++ b/templates/reset_password.html
@@ -29,13 +29,14 @@
           <div class="oh-auth-card">
             <h1 class="oh-onboarding-card__title oh-onboarding-card__title--h2 text-center my-3">{% trans "Reset Password" %}</h1>
             <p class="text-muted text-center">{% trans "Enter your new password to reset" %}</p>
-            <form method='post' class="oh-form-group">
+            <form method='post' class="oh-form-group" onsubmit="event.stopPropagation()">
               {% csrf_token %}
               <div class="oh-input-group">
                 <label class="oh-label" for="password">{% trans "New Password" %}</label>
                 <div class="oh-password-input-container">
                   {{form.password}}
-                  <button
+                  <a
+                  href="#"
                   class="oh-btn oh-btn--transparent oh-password-input--toggle"
                   >
                   <ion-icon
@@ -48,7 +49,7 @@
                   title="Hide Password"
                   name="eye-off-outline"
                   ></ion-icon>
-                </button>
+                </a>
               </div>
               {{form.password.errors}}
               </div>
@@ -57,7 +58,8 @@
                 <label class="oh-label" for="confirmPassword">{% trans "Confirm New Password" %}</label>
                 <div class="oh-password-input-container">
                   {{form.confirm_password}}
-                  <button
+                  <a
+                  href="#"
                   class="oh-btn oh-btn--transparent oh-password-input--toggle"
                   >
                   <ion-icon
@@ -70,7 +72,7 @@
                   title="Hide Password"
                   name="eye-off-outline"
                   ></ion-icon>
-                </button>
+                </a>
               </div>
               {{form.confirm_password.errors}}
               </div>