diff --git a/netbox/templates/account/password.html b/netbox/templates/account/password.html
index 4a2cf640f..002ecadc7 100644
--- a/netbox/templates/account/password.html
+++ b/netbox/templates/account/password.html
@@ -5,10 +5,10 @@
 {% block title %}{% trans "Change Password" %}{% endblock %}
 
 {% block content %}
-  <form action="." method="post" class="form form-horizontal col-md-8 offset-md-2">
+  <form action="." method="post" class="object-edit">
     {% csrf_token %}
-    <div class="field-group">
-      <h5 class="text-center">{% trans "Password" %}</h5>
+    <div class="field-group mb-5">
+      <h5 class="col-9 offset-3">{% trans "Password" %}</h5>
       {% render_field form.old_password %}
       {% render_field form.new_password1 %}
       {% render_field form.new_password2 %}
diff --git a/netbox/templates/account/profile.html b/netbox/templates/account/profile.html
index f494df910..6a58450e0 100644
--- a/netbox/templates/account/profile.html
+++ b/netbox/templates/account/profile.html
@@ -66,7 +66,7 @@
       <div class="col-md-12">
         <div class="card">
           <h5 class="card-header text-center">{% trans "Recent Activity" %}</h5>
-          <div class="card-body table-responsive">
+          <div class="table-responsive">
             {% render_table changelog_table 'inc/table.html' %}
           </div>
         </div>
diff --git a/netbox/templates/account/token_list.html b/netbox/templates/account/token_list.html
index ee57c29d5..037f8817c 100644
--- a/netbox/templates/account/token_list.html
+++ b/netbox/templates/account/token_list.html
@@ -16,7 +16,7 @@
   <div class="row mb-3">
     <div class="col col-md-12">
       <div class="card">
-        <div class="card-body table-responsive">
+        <div class="table-responsive">
           {% render_table table 'inc/table.html' %}
           {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
         </div>