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