Fix overlapping conditions in User.state_sync

users/models.py

@@ -643,6 +643,7 @@ class User(
             self.__original_state != self.STATE_ACTIVE
             and self.state == self.STATE_ACTIVE
         ):
+            self.email_change_date = None
             self.unarchive()
         elif (
             self.__original_state != self.STATE_ARCHIVE
@@ -659,10 +660,6 @@ class User(
             and self.state == self.STATE_EMAIL_NOT_YET_CONFIRMED
         ):
             self.email_change_date = timezone.now()
-        elif (
-            self.state == self.STATE_ACTIVE
-        ):
-            self.email_change_date = None
 
     def ldap_sync(
         self, base=True, access_refresh=True, mac_refresh=True, group_refresh=False