diff --git a/templates/account/base.html b/templates/account/base.html
index 8d151cf..2e9055d 100644
--- a/templates/account/base.html
+++ b/templates/account/base.html
@@ -1,5 +1,3 @@
-{% extends "theme_bootstrap/subnav_base.html" %}
-
 {% load i18n %}
 
 {% block content_class %}account{% endblock %}
diff --git a/templates/account/password_change.html b/templates/account/password_change.html
index b218fe9..9dc039c 100644
--- a/templates/account/password_change.html
+++ b/templates/account/password_change.html
@@ -1,7 +1,6 @@
-{% extends "account/base.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
-{% load bootstrap %}
 
 {% block content_class %}account account-password{% endblock %}
 
@@ -14,10 +13,10 @@
                 <legend>{% trans "Change password" %}</legend>
                 <fieldset>
                     {% csrf_token %}
-                    {{ form|bootstrap }}
+                    {{ form }}
                     <button type="submit" class="btn btn-primary">{% trans "Save" %}</button>
                 </fieldset>
             </form>
         </div>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/account/password_reset.html b/templates/account/password_reset.html
index 33bd795..3b983b0 100644
--- a/templates/account/password_reset.html
+++ b/templates/account/password_reset.html
@@ -1,7 +1,6 @@
 {% extends "base.html" %}
 
 {% load i18n %}
-{% load bootstrap %}
 {% load account_tags %}
 
 {% block title %}{% trans "Password reset" %}{% endblock %}
@@ -17,7 +16,7 @@
                 <fieldset class="row">
                     <div class="col-md-5">
                         {% csrf_token %}
-                        {{ form|bootstrap }}
+                        {{ form }}
                         <button type="submit" class="btn btn-primary">
                             {% trans "Reset my password" %}
                         </button>
@@ -33,4 +32,4 @@
     <script>
         $("#id_email").focus();
     </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/account/password_reset_token.html b/templates/account/password_reset_token.html
index 13dfc79..3993ad6 100644
--- a/templates/account/password_reset_token.html
+++ b/templates/account/password_reset_token.html
@@ -1,7 +1,6 @@
 {% extends "base.html" %}
 
 {% load i18n %}
-{% load bootstrap %}
 
 {% block title %}{% trans "Set your new password" %}{% endblock %}
 
@@ -12,10 +11,10 @@
                 <legend>{% trans "Set your new password" %}</legend>
                 <fieldset>
                     {% csrf_token %}
-                    {{ form|bootstrap }}
+                    {{ form }}
                     <button type="submit" class="btn btn-primary">{% trans "Save" %}</button>
                 </fieldset>
             </form>
         </div>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/account/settings.html b/templates/account/settings.html
index 455b076..9a302e8 100644
--- a/templates/account/settings.html
+++ b/templates/account/settings.html
@@ -1,7 +1,6 @@
-{% extends "account/base.html" %}
+{% extends "base.html" %}
 
 {% load i18n %}
-{% load bootstrap %}
 
 {% block content_class %}account account-settings{% endblock %}
 
@@ -13,7 +12,7 @@
             <form method="POST" action="{% url "account_settings" %}">
                 <legend>{% trans "Account" %}</legend>
                 {% csrf_token %}
-                {{ form|bootstrap }}
+                {{ form }}
                 <button class="btn btn-primary" type="submit">{% trans "Save" %}</button>
             </form>
         </div>