diff --git a/timepiece/forms.py b/timepiece/forms.py
index <HASH>..<HASH> 100644
--- a/timepiece/forms.py
+++ b/timepiece/forms.py
@@ -77,12 +77,12 @@ class EditPersonForm(auth_forms.UserChangeForm):
         label=_(u'Repeat Password'),
         widget=forms.PasswordInput(render_value=False))
 
-    class Meta:
-        model = auth_models.User
-        fields = (
-            "username", "first_name", "last_name",
-            "email", "is_active", "is_staff"
-        )
+    def __init__(self, *args, **kwargs):
+        super(EditPersonForm, self).__init__(*args, **kwargs)
+
+        # In 1.4 this field is created even if it is excluded in Meta.
+        if 'password' in self.fields:
+            del(self.fields['password'])
 
     def clean_password(self):
         return self.cleaned_data.get('password_one', None)
@@ -106,6 +106,11 @@ class EditPersonForm(auth_forms.UserChangeForm):
             instance.save()
         return instance
 
+    class Meta:
+        model = auth_models.User
+        fields = ('username', 'first_name', 'last_name', 'email', 'is_active',
+                'is_staff')
+
 
 class QuickSearchForm(forms.Form):
     quick_search = selectable_forms.AutoCompleteSelectField(
refs #<I> - Removed extra password field from Edit Person form