diff --git a/pinaxcon/account_hooks.py b/pinaxcon/account_hooks.py
new file mode 100644
index 0000000000000000000000000000000000000000..e3affff3c4750f6fdfa6b6bf4327362383c4288e
--- /dev/null
+++ b/pinaxcon/account_hooks.py
@@ -0,0 +1,26 @@
+from account import hooks
+from django.contrib.auth.models import User
+
+
+class BetterAccountHookSet(hooks.AccountDefaultHookSet):
+
+    def get_user_credentials(self, form, identifier_field):
+        username = form.cleaned_data[identifier_field]
+
+        # Find an actual username so we can authenticate
+        print username,
+        if identifier_field == "email":
+            username = self.get_username_by_email(username)
+        print username,
+
+        return {
+            "username": username,
+            "password": form.cleaned_data["password"],
+        }
+
+    def get_username_by_email(self, email):
+
+        try:
+            return User.objects.get(email=email).username
+        except User.DoesNotExist:
+            return None
diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index 8501577c02716bc40ef9ad62ecd7da7339070fcc..0e39def4c8b79e65c99f67eb02a96ededd43c613 100644
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@@ -272,6 +272,7 @@ ACCOUNT_LOGIN_REDIRECT_URL = "home"
 ACCOUNT_LOGOUT_REDIRECT_URL = "home"
 ACCOUNT_EMAIL_CONFIRMATION_EXPIRE_DAYS = 2
 ACCOUNT_USE_AUTH_AUTHENTICATE = True
+ACCOUNT_HOOKSET =  "pinaxcon.account_hooks.BetterAccountHookSet"
 
 AUTHENTICATION_BACKENDS = [
     "symposion.teams.backends.TeamPermissionsBackend",
diff --git a/pinaxcon/templates/account_login.html b/pinaxcon/templates/account_login.html
index 59f0bbc7474fd6ac11ab2baf90f46d2b6b76c3e8..a660e25004b85b5a0636365c052abeebb0cd7293 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 'account_login' %}" method="POST">
+        <form action="{% url 'nbpy_login_handle' %}" method="POST">
           <div class="panel panel-primary">
             <div class="panel-heading">
               <h3 class="panel-title">
@@ -24,7 +24,7 @@
             </div>
             <div class="panel-body">
               {% csrf_token %}
-              {{ login_form| bootstrap }}
+              {{ login_form|bootstrap }}
             </div>
             <div class="panel-footer">
               <button role="submit" class="btn btn-primary">Log In</button>
diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py
index 534792f33e3d8f340b6ce00a92ad225d808a28bc..2cd7bf6858634151e1333601534d375aac3545a6 100644
--- a/pinaxcon/urls.py
+++ b/pinaxcon/urls.py
@@ -53,6 +53,7 @@ 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"),
     url(r"^account/", include("account.urls")),
 
     url(r"^dashboard/", symposion.views.dashboard, name="dashboard"),
diff --git a/pinaxcon/views.py b/pinaxcon/views.py
index 34b8d231388da29cc8ef122529ba5345ef1caf52..63401ead9e0ba97a1ca65190ac29ea7f2a53b6a9 100644
--- a/pinaxcon/views.py
+++ b/pinaxcon/views.py
@@ -7,6 +7,7 @@ from django.template.loader import get_template
 from django.views import defaults
 
 from account.forms import LoginEmailForm, LoginUsernameForm, SignupForm
+from account.views import LoginView
 
 def server_error(request, template_name=defaults.ERROR_500_TEMPLATE_NAME):
     t = Template("{%% include '%s' %%}" % template_name)
@@ -16,10 +17,14 @@ def server_error(request, template_name=defaults.ERROR_500_TEMPLATE_NAME):
 def account_login(request):
 
     d = {
-        "login_form": LoginUsernameForm(),
+        "login_form": LoginEmailForm(),
         "signup_form": SignupForm(),
         "signup_open": getattr(settings, "ACCOUNT_OPEN_SIGNUP", True),
     }
 
     print d["signup_open"], settings.ACCOUNT_OPEN_SIGNUP
     return render(request, "account_login.html", d)
+
+
+class EmailLoginView(LoginView):
+    form_class = LoginEmailForm