diff --git a/colab/accounts/urls.py b/colab/accounts/urls.py
index 996175e..8e13120 100644
--- a/colab/accounts/urls.py
+++ b/colab/accounts/urls.py
@@ -12,6 +12,9 @@ urlpatterns = patterns('',
         ChangeXMPPPasswordView.as_view(), name='change_password'),
 
     url(r'^login/?$', LoginView.as_view(), name='login'),
+#    url(r'^login/?$', 'django.contrib.auth.views.login', name='login'),
+
+#    url(r'^logout/?$',  'accounts.views.logoutColab', name='logout'),
 
     url(r'^(?P<username>[\w@+.-]+)/?$',
         UserProfileDetailView.as_view(), name='user_profile'),
diff --git a/colab/static/css/screen.css b/colab/static/css/screen.css
index dc9cf89..8b58cc5 100644
--- a/colab/static/css/screen.css
+++ b/colab/static/css/screen.css
@@ -117,7 +117,7 @@ form.signup .form-group {
 
 div.submit {
     margin: auto;
-    margin-bottom: 5em;
+    margin-bottom: 2em;
     width: 200px;
 }
 
diff --git a/src/accounts/templates/registration/login.html b/src/accounts/templates/registration/login.html
new file mode 100644
index 0000000..0abc3a2
--- /dev/null
+++ b/src/accounts/templates/registration/login.html
@@ -0,0 +1,50 @@
+
+{% extends "base.html" %}
+{% load i18n %}
+{% block main-content %}
+
+
+<div class="row">
+  {% if form.errors %}
+  <div class="alert alert-danger">
+    <b>{% trans "Please correct the errors below and try again" %}</b>
+  </div>
+  {% endif %}
+</div>
+
+<br>
+<form action="{% url 'login' %}" method="post" role="form" class="form-horizontal signup">
+  {% csrf_token %}
+
+  <div class="row">
+    <div class="col-md-4 col-md-offset-4 col-lg-4 col-lg-4 col-sm-8 col-sm-offset-2 col-xs-12">
+      <div class="panel panel-default">
+        <div class="panel-heading"><h3 class="panel-title">{% trans 'Login' %}</h3></div>
+
+        <div class="panel-body">
+          <div class="form-group{% if form.username.errors %} alert alert-danger has-error{% endif %}">
+            {{ form.username.label_tag }}
+            <input class="form-control" id="id_username" maxlength="254" name="username" type="text">
+            {{ form.username.errors }}
+          </div>
+          <div class="form-group{% if form.password.errors %} alert alert-danger has-error{% endif %}">
+            {{ form.password.label_tag }}
+            <input class="form-control" id="id_password" name="password" type="password">
+            {{ form.password.errors }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="submit">
+      <input type="submit" value="{% trans 'Login' %}" class="btn btn-primary btn-lg btn-block">
+    </div>
+    <p class="text-center"><a>{% trans 'Forgot Password?' %}</a></p>
+  </div>
+
+</form>
+
+{% endblock %}
+
--
libgit2 0.21.2