diff --git a/colab/accounts/urls.py b/colab/accounts/urls.py
index cc6e9e5..996175e 100644
--- a/colab/accounts/urls.py
+++ b/colab/accounts/urls.py
@@ -1,10 +1,9 @@
 
-from django.conf.urls import patterns, include, url
+from django.conf.urls import patterns, url
 
-from .views import (UserProfileDetailView, UserProfileUpdateView,
+from .views import (UserProfileDetailView, UserProfileUpdateView, LoginView,
                     ManageUserSubscriptionsView, ChangeXMPPPasswordView)
 
-from . import views
 
 urlpatterns = patterns('',
     url(r'^register/$', 'colab.accounts.views.signup', name='signup'),
@@ -12,6 +11,8 @@ urlpatterns = patterns('',
     url(r'^change-password/$',
         ChangeXMPPPasswordView.as_view(), name='change_password'),
 
+    url(r'^login/?$', LoginView.as_view(), name='login'),
+
     url(r'^(?P<username>[\w@+.-]+)/?$',
         UserProfileDetailView.as_view(), name='user_profile'),
 
diff --git a/colab/accounts/views.py b/colab/accounts/views.py
index 8f592d7..8d194f5 100644
--- a/colab/accounts/views.py
+++ b/colab/accounts/views.py
@@ -13,7 +13,7 @@ from django.utils.translation import ugettext as _
 from django.shortcuts import render, redirect, get_object_or_404
 from django.core.urlresolvers import reverse
 from django.core.exceptions import PermissionDenied
-from django.views.generic import DetailView, UpdateView
+from django.views.generic import DetailView, UpdateView, TemplateView
 from django.utils.decorators import method_decorator
 
 from django.http import HttpResponse
@@ -30,6 +30,10 @@ from .errors import XMPPChangePwdException
 from .utils import mailman
 
 
+class LoginView(TemplateView):
+    template_name = "accounts/login.html"
+
+
 class UserProfileBaseMixin(object):
     model = get_user_model()
     slug_field = 'username'
diff --git a/colab/settings.py b/colab/settings.py
index 848d8a0..663eaf0 100644
--- a/colab/settings.py
+++ b/colab/settings.py
@@ -257,7 +257,7 @@ SITE_URL = 'http://localhost:8000'
 BROWSERID_AUDIENCES = [SITE_URL, SITE_URL.replace('https', 'http')]
 
 
-LOGIN_URL = '/'
+LOGIN_URL = '/user/login'
 LOGIN_REDIRECT_URL = '/'
 LOGIN_REDIRECT_URL_FAILURE = '/'
 LOGOUT_REDIRECT_URL = '/'
--
libgit2 0.21.2