diff --git a/pagure/templates/login/password_recover.html b/pagure/templates/login/password_recover.html
index 310163d..2f3fd53 100644
--- a/pagure/templates/login/password_recover.html
+++ b/pagure/templates/login/password_recover.html
@@ -14,18 +14,12 @@
             <strong>Change password</strong>
         </div>
         <form action="{{ url_for('change_password', username=g.fas_user.username) }}" method="POST">
-            <table>
-                {{ render_bootstrap_field(form.old_password) }}
-                {{ render_bootstrap_field(form.password) }}
-                {{ render_bootstrap_field(form.confirm_password) }}
-            </table>
-            <p class="buttons indent">
-                <input type="submit" class="submit positive button"  class="btn btn-primary" value="Update">
-                <a href="{{ url_for('index') }}">
-                    <input type="button" value="Cancel" class="button" class="btn btn-secondary">
-                </a>
-                {{ form.csrf_token }}
-            </p>
+            {{ render_bootstrap_field(form.old_password) }}
+            {{ render_bootstrap_field(form.password) }}
+            {{ render_bootstrap_field(form.confirm_password) }}
+            {{ form.csrf_token }}
+            <input class="btn btn-primary" type="submit" value="Update" title="Update description">
+            <input type="button" value="Cancel" class="btn btn-default" onclick="history.back();">
         </form>
      </div>
    </div>