From a940f4f0787136a4e0c252ac23e2ae3e0e43877e Mon Sep 17 00:00:00 2001
From: Jean-Romain Garnier <jean-romain.garnier@supelec.fr>
Date: Fri, 17 Apr 2020 18:32:38 +0200
Subject: [PATCH] Fix marking email as verified

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

diff --git a/users/models.py b/users/models.py
index f6b9387e..9c43561f 100755
--- a/users/models.py
+++ b/users/models.py
@@ -920,12 +920,9 @@ class User(
 
     def confirm_mail(self):
         """Marque l'email de l'utilisateur comme confirmé"""
-        # Reset the email change date
+        # Reset the email change date and update the email status
         self.email_change_date = None
-
-        # Let the "set_active" method handle the rest
-        self.state = self.STATE_NOT_YET_ACTIVE
-        self.set_active()
+        self.email_state = self.EMAIL_STATE_VERIFIED
 
     @cached_property
     def email_address(self):