diff --git a/src/main/java/org/olat/user/ProfileFormController.java b/src/main/java/org/olat/user/ProfileFormController.java
index e0eaee5fa0ce3f9169b038c7d652607f2966c201..b7092601c4078b6472ab1c3bd75f8a17269f55e0 100644
--- a/src/main/java/org/olat/user/ProfileFormController.java
+++ b/src/main/java/org/olat/user/ProfileFormController.java
@@ -423,6 +423,8 @@ public class ProfileFormController extends FormBasicController {
 
 				identityToModify = updateIdentityFromFormData(identityToModify);
 				changedEmail = identityToModify.getUser().getProperty("email", null);
+				//if ((currentEmail == null && StringHelper.containsNonWhitespace(changedEmail))
+				//		|| (currentEmail != null && !currentEmail.equals(changedEmail))) {
 				if (!currentEmail.equals(changedEmail)) {
 					// allow an admin to change email without verification workflow. usermanager is only permitted to do so, if set by config.
 					if ( !(ureq.getUserSession().getRoles().isOLATAdmin()
@@ -457,9 +459,8 @@ public class ProfileFormController extends FormBasicController {
 		if (emailChanged) {
 			removeAsListenerAndDispose(dialogCtr);
 
-			String changerEMail = ureq.getIdentity().getUser().getProperty("email", ureq.getLocale());
 			String dialogText = "";
-			if(changerEMail != null && changerEMail.length() > 0 && changerEMail.equals(currentEmail)) {
+			if(identityToModify.equals(ureq.getIdentity())) {
 				dialogText = translate("email.change.dialog.text");
 			} else {
 				dialogText = translate("email.change.dialog.text.usermanager");