diff --git a/colab/accounts/urls.py b/colab/accounts/urls.py
index 5da9ee2..d9eeade 100644
--- a/colab/accounts/urls.py
+++ b/colab/accounts/urls.py
@@ -39,7 +39,7 @@ if not BROWSERID_ENABLED:
     )
 else:
     urlpatterns = patterns('',
-        url(r'^login/?$', LoginView.as_view(), name='colab.login'),
+        url(r'^login/?$', LoginView.as_view(), name='login'),
     )
 
 urlpatterns += patterns('',
diff --git a/colab/templates/base.html b/colab/templates/base.html
index 4bb64c9..a4d37a4 100644
--- a/colab/templates/base.html
+++ b/colab/templates/base.html
@@ -141,7 +141,11 @@
                       <div>
                         <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a>
                         {% trans 'Logout' as logout_text %}
-                        {% browserid_logout text=logout_text link_class='btn btn-default pull-right' %}
+                        {% if BROWSERID_ENABLED %}
+                          {% browserid_logout text=logout_text link_class='btn btn-default pull-right' %}
+                        {% else %}
+                          <a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a>
+                        {% endif %}
                       </div>
                     </div>
                   </li>
--
libgit2 0.21.2