diff --git a/k4ever/main/templates/registration/login.html b/k4ever/main/templates/registration/login.html
index 9bf5487..b1067e6 100644
--- a/k4ever/main/templates/registration/login.html
+++ b/k4ever/main/templates/registration/login.html
@@ -10,7 +10,7 @@
 {% endcomment %}
 
 {% block "content" %}
-
-{% include "registration/loginForm.html" %}
-
+	<div class="span6" style="margin: 0 auto; float: none;">
+		{% include "registration/loginForm.html" %}
+	</div>
 {% endblock %}
diff --git a/k4ever/main/templates/registration/loginForm.html b/k4ever/main/templates/registration/loginForm.html
index 13dfca2..f1def24 100644
--- a/k4ever/main/templates/registration/loginForm.html
+++ b/k4ever/main/templates/registration/loginForm.html
@@ -8,24 +8,22 @@
 {% endcomment %}
 
 {% if form.errors %}
-<div class="error">
-	<h2>Deine Logindaten sind fehlerhaft</h2>
-	<p>Versuch es nochmal, aber achte auf CAPSLOCK und tippe nicht so schnell.</p>
-	<p>Falls du dein Passwort vergessen haben solltest (oder es nicht geht..),
-	dann melde dich bei deiner <a href="http://www.antifa.de/cms/">Local Antifa</a>
-	oder einem Admin <a href="http://superfluousandsparse.blogspot.com/">
-	unserer Wahl</a>.</p>
-</div>
+	<div class="alert alert-error alert-block">
+		<h4 class="alert-heading">Deine Logindaten sind fehlerhaft</h4>
+		<p>Versuch es nochmal, aber achte auf CAPSLOCK und tippe nicht so schnell.</p>
+	</div>
 {% endif %}
 
-<form class="login" method="post" action="/user/login/">
-{% csrf_token %}
-	<fieldset>
-		<p>{{ form.username.label_tag }} {{ form.username }}</p>
-		<p>{{ form.password.label_tag }} {{ form.password }}</p>
-	</fieldset>
-
-	<input type="submit" class="button" value="Anmelden" />
+<form class="form-horizontal" method="post" action="/user/login/">
+	{% csrf_token %}
 	<input type="hidden" name="next" value="{{ next }}" />
+
+	{% include "form.html" with form=form %}
+
+	<div class="control-group">
+		<div class="controls">
+			<input type="submit" class="btn btn-primary" value="Anmelden" />
+		</div>
+	</div>
 </form>
 
diff --git a/k4ever/main/templates/registration/logout.html b/k4ever/main/templates/registration/logout.html
index 4e331ea..0cc624e 100644
--- a/k4ever/main/templates/registration/logout.html
+++ b/k4ever/main/templates/registration/logout.html
@@ -10,10 +10,11 @@
 {% endcomment %}
 
 {% block "content" %}
-<div class="success">
-	<h2>Du hast dich erfolgreich abgemeldet</h2>
-</div>
-
-{% include "registration/loginForm.html" %}
+	<div class="span6" style="margin: 0 auto; float: none;">
+		<div class="alert alert-success">
+			<h4>Du hast dich erfolgreich abgemeldet.</h4>
+		</div>
 
+		{% include "registration/loginForm.html" %}
+	</div>
 {% endblock %}