diff --git a/app/vapemap/templates/registration/login.html b/app/vapemap/templates/registration/login.html
index 989d81b..e3a6b6d 100644
--- a/app/vapemap/templates/registration/login.html
+++ b/app/vapemap/templates/registration/login.html
@@ -1,12 +1,14 @@
 {% extends "base.html" %}
 {% load i18n %}
+{% load bootstrap %}
 
 {% block content %}
-<form method="post" action=".">
-  {{ form.as_p }}
+<form class="form" method="post">
+  {{ form|bootstrap }}
 
-  <input type="submit" value="{% trans 'Log in' %}" />
+  <input class="btn" type="submit" value="{% trans 'Log in' %}" />
   <input type="hidden" name="next" value="{{ next }}" />
+  {% csrf_token %}
 </form>
 
 <p>{% trans "Forgot password" %}? <a href="{% url "auth_password_reset" %}">{% trans "Reset it" %}</a>!</p>
diff --git a/app/vapemap/templates/registration/password_change_form.html b/app/vapemap/templates/registration/password_change_form.html
index c27253c..54d52e7 100644
--- a/app/vapemap/templates/registration/password_change_form.html
+++ b/app/vapemap/templates/registration/password_change_form.html
@@ -1,10 +1,11 @@
 {% extends "base.html" %}
 {% load i18n %}
+{% load bootstrap %}
 
 {% block content %}
-<form method="post" action=".">
-  {{ form.as_p }}
+<form class="form" method="post">
+  {{ form|bootstrap }}
 
-  <input type="submit" value="{% trans 'Submit' %}" />
+  <input class="btn" type="submit" value="{% trans 'Submit' %}" />
 </form>
 {% endblock %}
diff --git a/app/vapemap/templates/registration/password_reset_confirm.html b/app/vapemap/templates/registration/password_reset_confirm.html
index 9ab7262..e0782aa 100644
--- a/app/vapemap/templates/registration/password_reset_confirm.html
+++ b/app/vapemap/templates/registration/password_reset_confirm.html
@@ -1,14 +1,15 @@
 {% extends "base.html" %}
 {% load i18n %}
+{% load bootstrap %}
 
 {% block content %}
 
 {% if validlink %}
 
 <form method="post" action=".">
-  {{ form.as_p }}
-
-  <input type="submit" value="{% trans 'Submit' %}" />
+  {{ form|bootstrap }}
+  {% csrf_token %}
+  <input class="btn" type="submit" value="{% trans 'Submit' %}" />
 </form>
 
 {% else %}
diff --git a/app/vapemap/templates/registration/password_reset_form.html b/app/vapemap/templates/registration/password_reset_form.html
index c27253c..b46d8b8 100644
--- a/app/vapemap/templates/registration/password_reset_form.html
+++ b/app/vapemap/templates/registration/password_reset_form.html
@@ -1,10 +1,11 @@
 {% extends "base.html" %}
 {% load i18n %}
+{% load bootstrap %}
 
 {% block content %}
-<form method="post" action=".">
-  {{ form.as_p }}
-
-  <input type="submit" value="{% trans 'Submit' %}" />
+<form class="btn" method="post">
+  {{ form|bootstrap }}
+  {% csrf_token %}
+  <input class="btn" type="submit" value="{% trans 'Submit' %}" />
 </form>
 {% endblock %}
diff --git a/app/vapemap/templates/registration/registration_form.html b/app/vapemap/templates/registration/registration_form.html
index c27253c..bf3d6ce 100644
--- a/app/vapemap/templates/registration/registration_form.html
+++ b/app/vapemap/templates/registration/registration_form.html
@@ -1,10 +1,11 @@
 {% extends "base.html" %}
 {% load i18n %}
+{% load bootstrap %}
 
 {% block content %}
-<form method="post" action=".">
-  {{ form.as_p }}
-
-  <input type="submit" value="{% trans 'Submit' %}" />
+<form class="form" method="post">
+  {{ form|bootstrap }}
+  {% csrf_token %}
+  <input class="btn" type="submit" value="{% trans 'Submit' %}" />
 </form>
 {% endblock %}