diff --git a/templates/registration/password_change_form.html b/templates/registration/password_change_form.html
index c349f3f..da54266 100644
--- a/templates/registration/password_change_form.html
+++ b/templates/registration/password_change_form.html
@@ -3,7 +3,28 @@
 
 {% block content %}
 <form method="post" action=".">
-  {{ form.as_p }}
+    {% for hidden in form.hidden_fields %}
+        {{ hidden }}
+    {% endfor %}
+
+    {% for field in form.visible_fields %}
+        {% if field.name in form.errors %}
+        <div class="form-group alert alert-danger">
+        {{ field.errors }}
+        {% else %}
+        <div class="form-group">
+        {% endif %}
+            <div class="control-label {% if field.required %}requiredlabel{% endif %}">
+                {{ field.label_tag }}
+            </div>
+            <div class="controls">
+                {{ field }}
+            </div>
+        <p>
+        {{ field.help_text|safe }}
+        </p>
+        </div>
+    {% endfor %}
 
   <input type="submit" class="btn btn-default" value="{% trans 'Submit' %}" />
   {% csrf_token %}
diff --git a/templates/registration/password_reset_confirm.html b/templates/registration/password_reset_confirm.html
index 98dd0b6..20b8e01 100644
--- a/templates/registration/password_reset_confirm.html
+++ b/templates/registration/password_reset_confirm.html
@@ -6,7 +6,28 @@
 {% if validlink %}
 
 <form id="password_form" method="post" action=".">
-  {{ form.as_p }}
+    {% for hidden in form.hidden_fields %}
+        {{ hidden }}
+    {% endfor %}
+
+    {% for field in form.visible_fields %}
+        {% if field.name in form.errors %}
+        <div class="form-group alert alert-danger">
+        {{ field.errors }}
+        {% else %}
+        <div class="form-group">
+        {% endif %}
+            <div class="control-label {% if field.required %}requiredlabel{% endif %}">
+                {{ field.label_tag }}
+            </div>
+            <div class="controls">
+                {{ field }}
+            </div>
+        <p>
+        {{ field.help_text|safe }}
+        </p>
+        </div>
+    {% endfor %}
 
   <input type="submit" class="btn btn-default" value="{% trans 'Submit' %}" />
   {% csrf_token %}
diff --git a/templates/registration/password_reset_form.html b/templates/registration/password_reset_form.html
index bb2ea93..b8ef4c3 100644
--- a/templates/registration/password_reset_form.html
+++ b/templates/registration/password_reset_form.html
@@ -3,7 +3,28 @@
 
 {% block content %}
 <form id="password_form" method="post" action=".">
-  {{ form.as_p }}
+    {% for hidden in form.hidden_fields %}
+        {{ hidden }}
+    {% endfor %}
+
+    {% for field in form.visible_fields %}
+        {% if field.name in form.errors %}
+        <div class="form-group alert alert-danger">
+        {{ field.errors }}
+        {% else %}
+        <div class="form-group">
+        {% endif %}
+            <div class="control-label {% if field.required %}requiredlabel{% endif %}">
+                {{ field.label_tag }}
+            </div>
+            <div class="controls">
+                {{ field }}
+            </div>
+        <p>
+        {{ field.help_text|safe }}
+        </p>
+        </div>
+    {% endfor %}
 
   <input type="submit" class="btn btn-default" value="{% trans 'Submit' %}" />
   {% csrf_token %}