diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py
index 6f454a87254105804a59d8d28cdc7a81bdad52e5..eed7a6a070fea1f905923fce648a7a25a8e0bd81 100644
--- a/pinaxcon/urls.py
+++ b/pinaxcon/urls.py
@@ -52,6 +52,9 @@ urlpatterns = [
 
     url(r"^admin/", include(admin.site.urls)),
 
+    url(r"^login$", views.account_login, name="nbpy_login"),
+    # Override the default account_login view with one that takes email addys
+    url(r"^account/login/$", views.EmailLoginView.as_view(), name="account_login"),
     url(r"^account/", include("account.urls")),
 
     url(r"^dashboard/", symposion.views.dashboard, name="dashboard"),