diff --git a/pinaxcon/account_hooks.py b/pinaxcon/account_hooks.py
index e3affff..6f2b0dd 100644
--- a/pinaxcon/account_hooks.py
+++ b/pinaxcon/account_hooks.py
@@ -19,7 +19,6 @@ class BetterAccountHookSet(hooks.AccountDefaultHookSet):
         }
 
     def get_username_by_email(self, email):
-
         try:
             return User.objects.get(email=email).username
         except User.DoesNotExist:
diff --git a/pinaxcon/templates/account_login.html b/pinaxcon/templates/account_login.html
index a660e25..a058d0c 100644
--- a/pinaxcon/templates/account_login.html
+++ b/pinaxcon/templates/account_login.html
@@ -15,7 +15,7 @@
     <div class="row">
       <div class="col-md-4">
 
-        <form action="{% url 'nbpy_login_handle' %}" method="POST">
+        <form action="{% url 'account_login' %}" method="POST">
           <div class="panel panel-primary">
             <div class="panel-heading">
               <h3 class="panel-title">
diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py
index 2cd7bf6..eed7a6a 100644
--- a/pinaxcon/urls.py
+++ b/pinaxcon/urls.py
@@ -53,7 +53,8 @@ urlpatterns = [
     url(r"^admin/", include(admin.site.urls)),
 
     url(r"^login$", views.account_login, name="nbpy_login"),
-    url(r"^login_handle$", views.EmailLoginView.as_view(), name="nbpy_login_handle"),
+    # 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"),