diff --git a/colab/accounts/urls.py b/colab/accounts/urls.py
index f54c42d..b1949e8 100644
--- a/colab/accounts/urls.py
+++ b/colab/accounts/urls.py
@@ -4,7 +4,7 @@ from django.conf.urls import patterns, url
 from .views import (UserProfileDetailView, UserProfileUpdateView, LoginView,
                     ManageUserSubscriptionsView, ChangeXMPPPasswordView)
 
-from accounts import views
+from colab.accounts import views
 from django.contrib.auth import views as auth_views
 
 from colab.settings import BROWSERID_ENABLED
@@ -30,12 +30,12 @@ if not BROWSERID_ENABLED:
     urlpatterns += patterns('',
         url(r'^login/?$', 'django.contrib.auth.views.login', name='login'),
 
-        url(r'^logout/?$',  'accounts.views.logoutColab', name='logout'),
+        url(r'^logout/?$',  'django.contrib.auth.views.logout', name='logout'),
 
-        url(r'^password-reset-done/?$', 'accounts.views.password_reset_done_custom',
+        url(r'^password-reset-done/?$', 'colab.accounts.views.password_reset_done_custom',
             name="password_reset_done"),
 
-        url(r'^password-reset-complete/$', 'accounts.views.password_reset_complete_custom',
+        url(r'^password-reset-complete/$', 'colab.accounts.views.password_reset_complete_custom',
             name="password_reset_complete"),
 
         url(r'^password-reset-confirm/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$',
@@ -52,7 +52,7 @@ if not BROWSERID_ENABLED:
             name='password_change'),
 
         url(r'^change-password-done/?$',
-            'accounts.views.password_changed', name='password_change_done'),
+            'colab.accounts.views.password_changed', name='password_change_done'),
     )
 else:
     urlpatterns += patterns('',
diff --git a/colab/accounts/views.py b/colab/accounts/views.py
index 3a24aad..efeaad2 100644
--- a/colab/accounts/views.py
+++ b/colab/accounts/views.py
@@ -161,7 +161,7 @@ def signup(request):
 
     user = user_form.save(commit=False)
     user.needs_update = False
-    if not browser_id_enabled:
+    if not BROWSERID_ENABLED:
         user.is_active = False
         EmailAddressValidation.create(user.email, user)
 
diff --git a/colab/urls.py b/colab/urls.py
index 6a57c70..79e0ca3 100644
--- a/colab/urls.py
+++ b/colab/urls.py
@@ -4,7 +4,7 @@ from django.views.generic import TemplateView
 from django.contrib import admin
 from django.views.generic import RedirectView
 
-from .accounts.models import User
+from colab.accounts.models import User
 from .search.forms import ColabSearchForm
 from .super_archives.models import Message
 
--
libgit2 0.21.2