diff --git a/passbook/core/forms/authentication.py b/passbook/core/forms/authentication.py
index 12c3380bb..81d90a5ed 100644
--- a/passbook/core/forms/authentication.py
+++ b/passbook/core/forms/authentication.py
@@ -81,13 +81,3 @@ class SignUpForm(forms.Form):
         if password != password_repeat:
             raise ValidationError(_("Passwords don't match"))
         return self.cleaned_data.get('password_repeat')
-
-
-class PasswordFactorForm(forms.Form):
-    """Password authentication form"""
-
-    password = forms.CharField(widget=forms.PasswordInput(attrs={
-        'placeholder': _('Password'),
-        'autofocus': 'autofocus',
-        'autocomplete': 'current-password'
-        }))
diff --git a/passbook/factors/password/forms.py b/passbook/factors/password/forms.py
index c790c4d43..32850fa70 100644
--- a/passbook/factors/password/forms.py
+++ b/passbook/factors/password/forms.py
@@ -16,6 +16,16 @@ def get_authentication_backends():
         yield backend, getattr(klass(), 'name', '%s (%s)' % (klass.__name__, klass.__module__))
 
 
+class PasswordForm(forms.Form):
+    """Password authentication form"""
+
+    password = forms.CharField(widget=forms.PasswordInput(attrs={
+        'placeholder': _('Password'),
+        'autofocus': 'autofocus',
+        'autocomplete': 'current-password'
+    }))
+
+
 class PasswordFactorForm(forms.ModelForm):
     """Form to create/edit Password Factors"""