From 7eca43a0c52d3f24725700471c1347a82952f123 Mon Sep 17 00:00:00 2001
From: Jean-Romain Garnier <jean-romain.garnier@supelec.fr>
Date: Fri, 17 Apr 2020 22:54:27 +0200
Subject: [PATCH] Don't set User.email_change_date to None

---
 users/models.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/users/models.py b/users/models.py
index f6596fa9..11db2a8e 100755
--- a/users/models.py
+++ b/users/models.py
@@ -812,8 +812,8 @@ class User(
         if self.state == self.STATE_FULL_ARCHIVE:
             return False
 
-        # Always keep the oldest change date
-        if self.email_change_date is None:
+        # Don't allow users without a confirmed email to postpone their due date
+        if self.state == self.STATE_ACTIVE or not self.email_change_date:
             self.email_change_date = timezone.now()
 
         self.save()
@@ -821,7 +821,7 @@ class User(
         return True
 
     def confirm_email_before_date(self):
-        if self.email_change_date is None or self.email_state == self.EMAIL_STATE_VERIFIED:
+        if self.email_state == self.EMAIL_STATE_VERIFIED:
             return None
 
         days = OptionalUser.get_cached_value("disable_emailnotyetconfirmed")
@@ -946,8 +946,6 @@ class User(
 
     def confirm_mail(self):
         """Marque l'email de l'utilisateur comme confirmé"""
-        # Reset the email change date and update the email status
-        self.email_change_date = None
         self.email_state = self.EMAIL_STATE_VERIFIED
 
     @cached_property