Merge pull request #45 from HuskerBob/master

Fixes #43 and #44.

password_policies/forms/__init__.py

@@ -93,11 +93,11 @@ def save(self, commit=True):
         self.user.set_password(new_password)
         if commit:
             self.user.save()
-        if settings.PASSWORD_USE_HISTORY:
-            password = make_password(new_password)
-            PasswordHistory.objects.create(password=password, user=self.user)
-            PasswordHistory.objects.delete_expired(self.user)
-        PasswordChangeRequired.objects.filter(user=self.user).delete()
+            if settings.PASSWORD_USE_HISTORY:
+                password = make_password(new_password)
+                PasswordHistory.objects.create(password=password, user=self.user)
+                PasswordHistory.objects.delete_expired(self.user)
+            PasswordChangeRequired.objects.filter(user=self.user).delete()
         return self.user
 
 
@@ -155,7 +155,8 @@ def clean(self):
     def save(self, commit=True):
         user = super(PasswordPoliciesChangeForm, self).save(commit=commit)
         try:
-            if user.password_change_required:
+            # Checking the object id to prevent AssertionError id is None when deleting.
+            if user.password_change_required and user.password_change_required.id:
                 user.password_change_required.delete()
         except ObjectDoesNotExist:
             pass