diff --git a/src/main/java/org/olat/registration/PwChangeController.java b/src/main/java/org/olat/registration/PwChangeController.java
index e623fe390e377e235845f8b9692aad054d51ef00..65f4a1e8ad65d4cc3a23da29f89b041a22d1819d 100644
--- a/src/main/java/org/olat/registration/PwChangeController.java
+++ b/src/main/java/org/olat/registration/PwChangeController.java
@@ -284,7 +284,7 @@ public class PwChangeController extends BasicController {
 		    .append(userTrans.translate("pwchange.body.alt", new String[] { serverpath, tk.getRegistrationKey(), i18nModule.getLocaleKey(ureq.getLocale()) }))
 		    .append("</div>")
 		    .append("<div class='o_footer'>")
-		    .append(userTrans.translate("reg.wherefrom", new String[] { serverpath, today, ip }))
+		    .append(userTrans.translate("reg.wherefrom", new String[] { serverpath, today }))
 		    .append("</div>");
 
 		MailBundle bundle = new MailBundle();
diff --git a/src/main/java/org/olat/registration/RegistrationController.java b/src/main/java/org/olat/registration/RegistrationController.java
index 11b0e7b1661fe5fd825b8120cd9b47f6fdccb68a..3e614f89451b08b6ea335d182c9f2032229af2ac 100644
--- a/src/main/java/org/olat/registration/RegistrationController.java
+++ b/src/main/java/org/olat/registration/RegistrationController.java
@@ -342,9 +342,7 @@ public class RegistrationController extends BasicController implements Activatea
 		String ip = ureq.getHttpReq().getRemoteAddr();
 		String serverpath = Settings.getServerContextPathURI();
 		String today = DateFormat.getDateInstance(DateFormat.LONG, ureq.getLocale()).format(new Date());
-		String[] whereFromAttrs = new String[]{
-			serverpath, today, ip
-		};
+		String[] whereFromAttrs = new String[]{ serverpath, today };
 
 		if (registrationManager.isRegistrationPending(email) || userManager.isEmailAllowed(email)) {
 			TemporaryKey tk = null;
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_ar.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_ar.properties
index 7936c3dfd65d2626db92c634a7d365544d10ea5d..f4ac39af44497a582522e7bfa61a536a85bfbffa 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_ar.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_ar.properties
@@ -49,7 +49,7 @@ pwkey.missingentry=\u0644\u0645 \u064a\u062a\u0645 \u0627\u0644\u0639\u062b\u064
 reg.body=<p>\u0634\u0643\u0631\u0627 \u0644\u0627\u0647\u062a\u0645\u0627\u0645\u0643 \u0628\u0623\u0648\u0644\u0627\u062a</p><p>{3} \u064a\u0631\u062c\u0649 \u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u0627\u0644\u0631\u0627\u0628\u0637</p><p>\u0644\u0627\u0633\u062a\u0643\u0645\u0627\u0644 \u062a\u0633\u062c\u064a\u0644\u0643 \u0641\u0649 \u0623\u0648\u0644\u0627\u062a.</p><p>\u0641\u064a \u062d\u0627\u0644\u0629 \u0639\u062f\u0645 \u0631\u063a\u0628\u062a\u0643 \u0641\u0649 \u0627\u0644\u062a\u0633\u062c\u064a\u0644\u060c \u0641\u0642\u0637 \u062a\u062c\u0627\u0647\u0644 \u0647\u0630\u0627 \u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u0649.</p><p>\u0641\u0631\u064a\u0642 \u0623\u0648\u0644\u0627\u062a</p>
 reg.notiEmail.subject=({0}) {2} {1} \u0645\u0633\u062a\u062e\u062f\u0645 \u062c\u062f\u064a\u062f \u0628\u0623\u0648\u0644\u0627\u062a
 reg.subject=\u0645\u0641\u062a\u0627\u062d \u0627\u0644\u062a\u0633\u062c\u064a\u0644 \u0641\u0649 \u0623\u0648\u0644\u0627\u062a
-reg.wherefrom=\u062a\u0645 \u0637\u0644\u0628 \u0627\u0644\u062a\u0633\u062c\u064a\u0644 \u0644\u0644\u0633\u064a\u0631\u0641\u0631 {0} \u0641\u0649 {1}\r\n{2} \u0645\u0646 \u0627\u0644\u0639\u0646\u0648\u0627\u0646
+reg.wherefrom=\u062a\u0645 \u0637\u0644\u0628 \u0627\u0644\u062a\u0633\u062c\u064a\u0644 \u0644\u0644\u0633\u064a\u0631\u0641\u0631 {0} \u0641\u0649 {1}
 registration.form.cancelled=\u0644\u0642\u062f \u0642\u0645\u062a \u0628\u0625\u0644\u063a\u0627\u0621 \u0639\u0645\u0644\u064a\u0629 \u0627\u0644\u062a\u0633\u062c\u064a\u0644.
 regkey.missing=\u0645\u0641\u062a\u0627\u062d \u0627\u0644\u062a\u0633\u062c\u064a\u0644 \u0645\u0641\u0642\u0648\u062f\u060c \u064a\u0631\u062c\u0649 \u0637\u0644\u0628 \u0648\u0627\u062d\u062f \u062c\u062f\u064a\u062f.
 regkey.missingentry=\u0645\u0641\u062a\u0627\u062d \u0627\u0644\u062a\u0633\u062c\u064a\u0644 \u063a\u064a\u0631 \u0645\u0648\u062c\u0648\u062f\u060c \u064a\u0631\u062c\u0649 \u0637\u0644\u0628 \u0648\u0627\u062d\u062f\u0627 \u0622\u062e\u0631.
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_bg.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_bg.properties
index 87af3ff9e79d155dcccb920773ce6a2ceaa15fe4..cc8dfa5b0f41ba0fc1d1d1c84f25799cc66ffe77 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_bg.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_bg.properties
@@ -40,7 +40,7 @@ pwkey.missingentry=\u041a\u043b\u044e\u0447\u044a\u0442 \u0437\u0430 \u043f\u044
 reg.body=<p>\u0411\u043b\u0430\u0433\u043e\u0434\u0430\u0440\u044f \u0437\u0430 \u0432\u0430\u0448\u0438\u044f \u0438\u043d\u0442\u0435\u0440\u0435\u0441 \u043a\u044a\u043c \u0441\u0438\u0441\u0442\u0435\u043c\u0430\u0442\u0430.</p><p>\u041c\u043e\u043b\u044f \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0439\u0442\u0435 \u0432\u0440\u044a\u0437\u043a\u0430\u0442\u0430 {3},<br>\u0437\u0430 \u0434\u0430 \u0437\u0430\u0432\u044a\u0440\u0448\u0438\u0442\u0435 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f\u0442\u0430.</p><p>\u0412 \u0441\u043b\u0443\u0447\u0430\u0439, \u0447\u0435 \u043d\u0435 \u0438\u0441\u043a\u0430\u0442\u0435 \u0434\u0430 \u0441\u0435 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u0430\u0442\u0435, \u043f\u0440\u043e\u0441\u0442\u043e \u0438\u0433\u043d\u043e\u0440\u0438\u0440\u0430\u0439\u0442\u0435 \u0442\u043e\u0437\u0438 \u0439-\u043c\u0430\u0439\u043b.</p>
 reg.notiEmail.subject=\u041d\u043e\u0432 \u043f\u043e\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043b \u043d\u0430 \u0441\u0438\u0441\u0442\u0435\u043c\u0430\u0442\u0430\: {1} {2} ({0})
 reg.subject=\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u0435\u043d \u043a\u043b\u044e\u0447 \u0437\u0430 \u0441\u0438\u0441\u0442\u0435\u043c\u0430\u0442\u0430
-reg.wherefrom=\u0422\u0430\u0437\u0438 \u0437\u0430\u044f\u0432\u043a\u0430 \u0437\u0430 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f \u043d\u0430 \u0441\u044a\u0440\u0432\u044a\u0440\u0430 {0} \u0435 \u043d\u0430\u043f\u0440\u0430\u0432\u0435\u043d\u0430 \u043d\u0430 {1} \r\n\u043e\u0442 IP \u0430\u0434\u0440\u0435\u0441 {2}.
+reg.wherefrom=\u0422\u0430\u0437\u0438 \u0437\u0430\u044f\u0432\u043a\u0430 \u0437\u0430 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f \u043d\u0430 \u0441\u044a\u0440\u0432\u044a\u0440\u0430 {0} \u0435 \u043d\u0430\u043f\u0440\u0430\u0432\u0435\u043d\u0430 \u043d\u0430 {1}.
 registration.form.cancelled=\u0412\u0438\u0435 \u043e\u0442\u043c\u0435\u043d\u0438\u0445\u0442\u0435 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u0438\u044f \u043f\u0440\u043e\u0446\u0435\u0441.
 regkey.missing=\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u0438\u044f\u0442 \u043a\u043b\u044e\u0447 \u043b\u0438\u043f\u0441\u0432\u0430. \u041c\u043e\u043b\u044f, \u043f\u043e\u0438\u0441\u043a\u0430\u0439\u0442\u0435 \u043d\u043e\u0432.
 regkey.missingentry=\u0422\u043e\u0437\u0438 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u0435\u043d \u043a\u043b\u044e\u0447 \u043d\u0435 \u0441\u044a\u0449\u0435\u0441\u0442\u0432\u0443\u0432\u0430. \u041c\u043e\u043b\u044f, \u043f\u043e\u0438\u0441\u043a\u0430\u0439\u0442\u0435 \u0434\u0440\u0443\u0433.
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_cs.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_cs.properties
index 0eef4643b7538f34fcc4c4c55c2803e480d5d084..db7ba180cf1d29aa70f5d58c7dcdb99c84b927cf 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_cs.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_cs.properties
@@ -39,7 +39,7 @@ pwkey.missingentry=Kl\u00ED\u010D pro zm\u011Bnu hesla nenalezen.
 reg.body=<p>D\u011Bkujeme za z\u00E1jem.</p><p>Pou\u017Eijte odkaz {3}</p><p>k \u00FApln\u00E9 registraci.</p><p>Pokud se nechcete zaregistrovat, tento e-mail ignorujte.</p><p>Spr\u00E1va syst\u00E9mu.</p>
 reg.notiEmail.subject=Nov\u00FD u\u017Eivatel OpenOLATu\: {1} {2} ({0})
 reg.subject=Registra\u010Dn\u00ED kl\u00ED\u010D
-reg.wherefrom=Tento registra\u010Dn\u00ED po\u017Eadavek  {0} byl ud\u011Bl\u00E1n {1} \nz IP adresy {2}.
+reg.wherefrom=Tento registra\u010Dn\u00ED po\u017Eadavek  {0} byl ud\u011Bl\u00E1n {1}.
 registration.form.cancelled=Zru\u0161il jste proces registrace.
 regkey.missing=Chyb\u00ED registra\u010Dn\u00ED kl\u00ED\u010D. \u0158ekn\u011Bte si o nov\u00FD.
 regkey.missingentry=Registra\u010Dn\u00ED kl\u00ED\u010D neexistuje. \u0158ekn\u011Bte si o jin\u00FD.
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_da.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_da.properties
index c07727e43dae039ab7ce5022db868c327127e62a..2b2dd94ff6f514b71a0e2242aa600784d7edb6b0 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_da.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_da.properties
@@ -40,7 +40,7 @@ pwkey.missingentry=N\u00F8gle til OpenOLAT kodeordsskift er ikke fundet.
 reg.body=<p>Tak for din interesse i OpenOLAT.</p><p>Benyt venligst dette link {3}</p><p>for at afslutte registreringen.</p><p>Hvis du ikke \u00F8nsker at registrere, skal du blot ignorere denne e-mail.</p><p>Dit OpenOLAT team.</p>
 reg.notiEmail.subject=Ny OpenOLAT bruger\: {1} {2} ({0})
 reg.subject=Registreringsn\u00F8gle til OpenOLAT
-reg.wherefrom=Denne registreringsanmodning til serveren {0} er foretaget {1} \nfra IP-adressen {2}.
+reg.wherefrom=Denne registreringsanmodning til serveren {0} er foretaget {1}.
 registration.form.cancelled=Du har afbrudt registreringsprocessen.
 regkey.missing=Registreringsn\u00F8glen mangler. Anmod venligst om en ny.
 regkey.missingentry=Denne registreringsn\u00F8gle findes ikke. Anmod venligst om en ny.
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_de.properties
index 16cee99cfbf0d3abce511776ee42f4b48c852728..2b1855f7a8917567309a33bacb1b89cbf31528ca 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_de.properties
@@ -90,7 +90,7 @@ reg.error.user_in_use=Benutzername ist schon besetzt
 reg.notiEmail.body=<p>Soeben hat sich ein neuer Benutzer in OpenOLAT registriert\:<br><ul><li>Name\: {2}</li><li>Vorname\: {1}</li><li>Login\: {0}</li><li>E-Mail\: {3}</li><li>Sprache\: {4}</li><li>Server\: {5}</li><li>Zu benutzer: <a href="{6}">{6}</a></li></p>
 reg.notiEmail.subject=Neuer OpenOLAT-Benutzer\: {1} {2} ({0})
 reg.subject=Registrierungsschl\u00FCssel f\u00FCr OpenOLAT
-reg.wherefrom=Diese Anfrage an den Server {0} wurde am {1} \nvon der IP-Adresse {2} abgeschickt.
+reg.wherefrom=Diese Anfrage an den Server {0} wurde am {1} abgeschickt.
 registration.form.cancelled=Sie haben die Registrierung abgebrochen.
 registration.pending.notification.mail=E-Mail Benachrichtigung f\u00FCr ausstehende Benutzer
 registration.pending.prop.name1=Benutzer-Attributename 1
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_el.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_el.properties
index 94155111d6ca071e9eb6ec636f1458c580c9afd1..6da921007d8a565bf4c227c0b2f79d79827005fd 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_el.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_el.properties
@@ -52,7 +52,6 @@ reg.error.title=\u0397 \u03b5\u03b3\u03b3\u03c1\u03b1\u03c6\u03ae \u03b1\u03ba\u
 reg.error.user_in_use=\u03a4\u03bf \u03cc\u03bd\u03bf\u03bc\u03b1 \u03c7\u03c1\u03ae\u03c3\u03c4\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9 \u03ae\u03b4\u03b7
 reg.notiEmail.subject=\u039d\u03ad\u03bf\u03c2 \u03a7\u03c1\u03ae\u03c3\u03c4\u03b7\u03c2 OpenOLAT\: {1} {2} ({0})
 reg.subject=\u039a\u03bb\u03b5\u03b9\u03b4\u03af \u03b5\u03b3\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2 \u03b3\u03b9\u03b1 \u03c4\u03bf OpenOLAT
-reg.wherefrom=\u0397 \u03b1\u03af\u03c4\u03b7\u03c3\u03b7 \u03b5\u03b3\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2 \u03c3\u03c4\u03bf server {0} \u03ad\u03b3\u03b9\u03bd\u03b5 \u03c3\u03c4\u03b9\u03c2 {1} \n\u03b1\u03c0\u03cc \u03c4\u03b7\u03bd \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 IP {2}.
 registration.form.cancelled=\u0388\u03c7\u03b5\u03c4\u03b5 \u03b1\u03ba\u03c5\u03c1\u03ce\u03c3\u03b5\u03b9 \u03c4\u03b7 \u03b4\u03b9\u03b1\u03b4\u03b9\u03ba\u03b1\u03c3\u03af\u03b1 \u03b5\u03b3\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2.
 regkey.missing=\u03a4\u03bf \u03ba\u03bb\u03b5\u03b9\u03b4\u03af \u03b5\u03b3\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2 \u03bb\u03b5\u03af\u03c0\u03b5\u03b9. \u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03ce \u03b6\u03b7\u03c4\u03ae\u03c3\u03c4\u03b5 \u03bd\u03b1 \u03c3\u03b1\u03c2 \u03b4\u03c9\u03b8\u03b5\u03af \u03ad\u03bd\u03b1 \u03bd\u03ad\u03bf.
 regkey.missingentry=\u03a4\u03bf \u03ba\u03bb\u03b5\u03b9\u03b4\u03af \u03b5\u03b3\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2 \u03b4\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9. \u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03ce \u03b6\u03b7\u03c4\u03ae\u03c3\u03c4\u03b5 \u03bd\u03b1 \u03c3\u03b1\u03c2 \u03b4\u03c9\u03b8\u03b5\u03af \u03ba\u03ac\u03c0\u03bf\u03b9\u03bf \u03ac\u03bb\u03bb\u03bf.
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_en.properties
index fca04b9a064bec172beecf6d2c21df0c36113bd4..d16e9d827951c3f1e51ce6636c71a2eee8a82f65 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_en.properties
@@ -90,7 +90,7 @@ reg.error.user_in_use=This user name already exists
 reg.notiEmail.body=<p>A new OpenOLAT user has just registered in OpenOLAT\:<br><ul><li>Name\: {2}</li><li>First name\: {1}</li><li>Login\: {0}</li><li>E-mail\:  {3}</li><li>Language\: {4}</li><li>Server\: {5}</li><li>To user: <a href="{6}">{6}</a></li></ul></p>
 reg.notiEmail.subject=New OpenOLAT user\: {1} {2} ({0})
 reg.subject=Registration key for OpenOLAT
-reg.wherefrom=This registration request to the server {0} was made on {1} \nfrom the IP address {2}.
+reg.wherefrom=This registration request to the server {0} was made on {1}.
 registration.form.cancelled=You have cancelled the registration process.
 registration.pending.notification.mail=Pending user creation notification mail
 registration.pending.prop.name1=User property name 1
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_es.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_es.properties
index 685762b1477943827d2d461a4e0adf87cda8c47a..e1c87021e0a6bf02fb3788e11eb010a96b2fcce6 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_es.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_es.properties
@@ -40,7 +40,7 @@ pwkey.missingentry=No se ha encontrado la clave para cambiar la contrase\u00F1a
 reg.body=<p>Gracias por tu inter\u00E9s en OpenOLAT.</p><p>Por favor utiliza el enlace {3} \npara completar el registro.</p><p>En caso de no querer registrarte, ignora este e-mail.</p><p>Tu equipo OpenOLAT.</p>
 reg.notiEmail.subject=Nuevo usuario OpenOLAT\: {1} {2} ({0})
 reg.subject=Clave de registro para OpenOLAT
-reg.wherefrom=Esta petici\u00F3n de registro al servidor {0} se hizo el {1} \ndesde la direcci\u00F3n IP {2}.
+reg.wherefrom=Esta petici\u00F3n de registro al servidor {0} se hizo el {1}.
 registration.form.cancelled=Has cancelado el proceso de registro.
 regkey.missing=Clave de registro no encontrada. Por favor solicita otra.
 regkey.missingentry=Esta clave de registro no existe. Por favor solicita otra.
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_fr.properties
index 45ed1dc99e8f58c17cf44b92729b2253b932d76e..c25cf099bd2250a971dd8fcebcd1d0a62eecc64e 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_fr.properties
@@ -90,7 +90,7 @@ reg.error.user_in_use=Le nom d'utilisateur existe d\u00E9j\u00E0
 reg.notiEmail.body=<p>Un nouvel utilisateur\:<br><ul><li>Nom\: {2}</li><li>Pr\u00E9nom\: {1}</li><li>Login\: {0}</li><li>E-mail\: {3}</li><li>Langue\: {4}</li><li>Serveur\: {5}</li><li>Vers l'utilisateur\: <a href\="{6}">{6}</a></li></ul></p>
 reg.notiEmail.subject=Nouvel utilisateur OpenOLAT {1} {2} ({0})
 reg.subject=Cl\u00E9 d'enregistrement pour OpenOLAT
-reg.wherefrom=Cette requ\u00EAte au serveur {0} a \u00E9t\u00E9 notifi\u00E9e le {1} par l'adresse IP {2}
+reg.wherefrom=Cette requ\u00EAte au serveur {0} a \u00E9t\u00E9 notifi\u00E9e le {1}.
 registration.form.cancelled=Vous avez annul\u00E9 l'enregistrement.
 registration.pending.notification.mail=Notification par courriel de la cr\u00E9ation d'utilisateur pendant
 registration.pending.prop.name1=Nom de l'attribut utilisateur 1
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_it.properties
index dba23676ef20473e2e5c64c6e1f9275af04ba250..700843f842a861028e34d8ed62c6c7944dc25704 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_it.properties
@@ -82,7 +82,7 @@ reg.error.title=Registrazione interrotta
 reg.error.user_in_use=Il nome d'utente esiste gi\u00E0
 reg.notiEmail.subject=Nuova/o utente OpenOLAT\: {1} {2} ({0})
 reg.subject=Chiave di registrazione per OpenOLAT
-reg.wherefrom=Questa richiesta al server {0} \u00E8 stata inoltrata in data {1} \r\ndall'indirizzo IP {2}.
+reg.wherefrom=Questa richiesta al server {0} \u00E8 stata inoltrata in data {1}.
 registration.form.cancelled=La procedura di registrazione \u00E8 stata interrotta.
 regkey.missing=La chiave di registrazione manca. Ne richieda una nuova, p.f.
 regkey.missingentry=Questa chiave di registrazione non esiste. Ne richieda una nuova, p.f.
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_jp.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_jp.properties
index e7fce0202cab903a5f22b019c06ba642dff88556..87553c40c5d1ceff557b242abfd22034f1f7e2fb 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_jp.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_jp.properties
@@ -49,7 +49,7 @@ reg.error.title=\u767b\u9332\u304c\u30ad\u30e3\u30f3\u30bb\u30eb\u3055\u308c\u30
 reg.error.user_in_use=\u3053\u306e\u30e6\u30fc\u30b6\u540d\u306f\u3059\u3067\u306b\u4f7f\u7528\u3055\u308c\u3066\u3044\u307e\u3059\u3002
 reg.notiEmail.subject=\u65b0\u3057\u3044OpenOLAT\u30e6\u30fc\u30b6\: {1} {2} ({0})
 reg.subject=OpenOLAT\u767b\u9332\u30ad\u30fc
-reg.wherefrom=\u3053\u306e\u767b\u9332\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u306f\u3001 \u30b5\u30fc\u30d0 {0} \u306b\u5bfe\u3057\u3066 {1} \u3001IP\u30a2\u30c9\u30ec\u30b9 {2} \u3088\u308a\u5b9f\u65bd\u3055\u308c\u307e\u3057\u305f\u3002
+reg.wherefrom=\u3053\u306e\u767b\u9332\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u306f\u3001 \u30b5\u30fc\u30d0 {0} \u306b\u5bfe\u3057\u3066 {1} \u3001IP\u30a2\u30c9\u30ec\u30b9
 registration.form.cancelled=\u3042\u306a\u305f\u306f\u3001\u767b\u9332\u51e6\u7406\u3092\u30ad\u30e3\u30f3\u30bb\u30eb\u3057\u307e\u3057\u305f\u3002
 regkey.missing=\u767b\u9332\u30ad\u30fc\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u65b0\u3057\u3044\u767b\u9332\u30ad\u30fc\u3092\u53d6\u5f97\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 regkey.missingentry=\u3053\u306e\u767b\u9332\u30ad\u30fc\u306f\u5b58\u5728\u3057\u3066\u3044\u307e\u305b\u3093\u3002\u5225\u306e\u767b\u9332\u30ad\u30fc\u3092\u53d6\u5f97\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_lt.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_lt.properties
index 171e53437d6c8abc1a9aa45c63b4936d065dce02..625fc72c673921269db2db622d50a5e487cb546a 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_lt.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_lt.properties
@@ -35,7 +35,7 @@ pwform.cancelled=Slapta\u017Eod\u017Eio pakeitimas atmestas. Slapta\u017Eodis li
 pwkey.missingentry=Raktas slapta\u017Eod\u017Eio pakeitimui nerastas.
 reg.body=<p>D\u0117kojame, kad domit\u0117s E. para\u0161o nuotolinio mokymo sistema.</p><p>Pra\u0161ome pasinaudoti nuoroda {3}<br>u\u017Ebaigti registracij\u0105.</p><p>Jei j\u016Bs nenorite registruotis, ignoruokit \u0161\u012F lai\u0161k\u0105.</p><p>J\u016Bs\u0173 E. para\u0161o nuotolinio mokymo sistemos komanda.</p>
 reg.subject=Registracijos raktas
-reg.wherefrom=Registracijos u\u017Eklausa serveriui {0} buvo atlikta {1} \ni\u0161 IP adreso {2}.
+reg.wherefrom=Registracijos u\u017Eklausa serveriui {0} buvo atlikta {1}.
 registration.form.cancelled=J\u016Bs at\u0161auk\u0117te registracijos proces\u0105.
 regkey.missing=Tr\u016Bksta registracijos rakto. Pra\u0161ome u\u017Eklausti dar vieno.
 regkey.missingentry=\u0160is registracijos raktas neegzistuoja. Pra\u0161ome u\u017Eklausti dar vieno.
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_nl_NL.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_nl_NL.properties
index bdf5eff3ad053b0521bb56e75bb083f19b17c6c9..f4edcc5c105bbf47377dd05da6ecbbc9236102c8 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_nl_NL.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_nl_NL.properties
@@ -52,7 +52,7 @@ reg.error.title=Registratie geannuleerd
 reg.error.user_in_use=Deze gebruikersnaam bestaat al
 reg.notiEmail.subject=Nieuwe OpenOLAT-gebruiker\: {1} {2} ({0})
 reg.subject=Registratiecode voor OpenOLAT
-reg.wherefrom=Dit registratieverzoek aan de server  {0} werd verstuurd {1} \\n vanuit het IP-adres {2}.
+reg.wherefrom=Dit registratieverzoek aan de server {0} werd verstuurd {1}.
 registration.form.cancelled=U hebt het registratieproces geannuleerd.
 regkey.missing=De registratiecode ontbreekt. Vraag een nieuwe aan.
 regkey.missingentry=Deze registratiecode bestaat niet. Vraag een andere aan.
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_pl.properties
index 7b3c0226ec79f0bb0863b1152f60fcb4c57e8fe0..2408beef593e6910e6589f719fc05cc5a35a26ed 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_pl.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_pl.properties
@@ -58,7 +58,7 @@ reg.error.title=Rejestracja anulowana
 reg.error.user_in_use=Podana nazwa u\u017Cytkownika ju\u017C istnieje
 reg.notiEmail.subject=Nowy u\u017Cytkownik OpenOLAT\: {1} {2} ({0})
 reg.subject=Klucz rejestracji OpenOLAT
-reg.wherefrom=Ta pr\u00F3ba rejestracji do serwera {0} zosta\u0142a przeprowadzona {1} \nz adresu IP {2}.
+reg.wherefrom=Ta pr\u00F3ba rejestracji do serwera {0} zosta\u0142a przeprowadzona {1}.
 registration.form.cancelled=Anulowa\u0142e\u015B proces rejestracji.
 regkey.missing=Brakuje klucza rejestracji. Popro\u015B o nowy.
 regkey.missingentry=Ten klucz rejestracji nie istnieje. Popro\u015B o inny.
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_pt_BR.properties
index d10a78fb4f1a5b0cea8a70685307a652d25ae5f1..e4e70133f16533ce92fed647de243b42c998a11b 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_pt_BR.properties
@@ -90,7 +90,7 @@ reg.error.user_in_use=Esse nome de usu\u00E1rio j\u00E1 existe
 reg.notiEmail.body=<p>Um novo usu\u00E1rio do OpenOLAT acaba de se registrar no OpenOLAT\:<br><ul><li>Nome\: {2} </li><li>Nome\: {1}</li><li>Login\: {0}</li><li> E-mail\: {3} </li><li>Idioma\: {4} </li><li>Servidor\: {5}</li><li>Para usu\u00E1rio\: <a href\="{6}">{6}</a></li></ul></p>
 reg.notiEmail.subject=Novo usu\u00E1rio do OpenOLAT \: {1} {2} ({0})
 reg.subject=Chave de registro para OpenOLAT
-reg.wherefrom=Este pedido de registro para o servidor {0} foi feito em {1} \ndo endere\u00E7o IP {2}.
+reg.wherefrom=Este pedido de registro para o servidor {0} foi feito em {1}.
 registration.form.cancelled=Voc\u00EA cancelou o processo de registro.
 registration.pending.notification.mail=Mensagem de cria\u00E7\u00E3o de usu\u00E1rio pendente
 registration.pending.prop.name1=Nome da propriedade do usu\u00E1rio 1
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_pt_PT.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_pt_PT.properties
index a0839f1c7ce7a5e0990b2ea78fb56dee64699ff4..2476d0cd978861320bef89075f8da1637db1b423 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_pt_PT.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_pt_PT.properties
@@ -40,7 +40,7 @@ pwkey.missingentry=Chave para altera\u00E7\u00E3o de senha OLA n\u00E3o encontra
 reg.body=<p>Agradecemos seu interesse no OpenOLAT.</p><p>Favor usar o link {3}<br>para completar o registro.</p><p>Caso n\u00E3o queira registrar-se, ignore este e-mail.</p><p>Sua Equipe OpenOLAT.</p>
 reg.notiEmail.subject=Novo usu\u00E1rio do OpenOLAT \: {1} {2} ({0})
 reg.subject=Chave de registro para OpenOLAT
-reg.wherefrom=Este pedido de registro para o servidor {0} foi feito em {1} \ndo endere\u00E7o IP {2}.
+reg.wherefrom=Este pedido de registro para o servidor {0} foi feito em {1}.
 registration.form.cancelled=Voc\u00EA cancelou o processo de registro.
 regkey.missing=Chave de registro perdida. Favor pedir outra.
 regkey.missingentry=Esta chave de registro n\u00E3o existe. Favor pedir outra.
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_ru.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_ru.properties
index 578366b870ef486b5ab513c06ca0565ad027eac5..975f04835a21a9b26b6223f2258225c53f2055a4 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_ru.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_ru.properties
@@ -40,7 +40,7 @@ pwkey.missingentry=\u0414\u043b\u044f \u0443\u0441\u0442\u0430\u043d\u043e\u0432
 reg.body=<p>\u0411\u043e\u043b\u044c\u0448\u043e\u0435 \u0441\u043f\u0430\u0441\u0438\u0431\u043e \u0437\u0430 \u0412\u0430\u0448 \u0438\u043d\u0442\u0435\u0440\u0435\u0441 \u043a \u0441\u0438\u0441\u0442\u0435\u043c\u0435 OpenOLAT.</p><p>\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u044f \u0441\u0441\u044b\u043b\u043a\u0443 {3}<br>\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u0412\u0430\u0448\u0438 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435.</p><p>\u0412 \u0442\u043e\u043c \u0441\u043b\u0443\u0447\u0430\u0435, \u0435\u0441\u043b\u0438 \u0412\u044b \u043d\u0435 \u0445\u043e\u0442\u0438\u0442\u0435 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0441\u044f, \u0443\u0434\u0430\u043b\u0438\u0442\u0435 \u044d\u0442\u043e\u0442 e-mail.</p><p>\u0412\u0430\u0448 OpenOLAT \u043a\u043e\u043b\u043b\u0435\u043a\u0442\u0438\u0432</p>
 reg.notiEmail.subject=\u041d\u043e\u0432\u044b\u0439 OpenOLAT-\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\: {1} {2} ({0})
 reg.subject=\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u044b\u0439 \u043a\u043b\u044e\u0447 \u0434\u043b\u044f OpenOLAT
-reg.wherefrom=\u042d\u0442\u043e\u0442 \u0437\u0430\u043f\u0440\u043e\u0441 \u043e\u0442\u043e\u0441\u043b\u0430\u043d {1} \u043d\u0430 \u0441\u0435\u0440\u0432\u0435\u0440 {0}\r\n\u0441 IP-\u0430\u0434\u0440\u0435\u0441\u0430 {2}.
+reg.wherefrom=\u042d\u0442\u043e\u0442 \u0437\u0430\u043f\u0440\u043e\u0441 \u043e\u0442\u043e\u0441\u043b\u0430\u043d {1} \u043d\u0430 \u0441\u0435\u0440\u0432\u0435\u0440 {0}.
 registration.form.cancelled=\u0412\u044b \u043e\u0442\u043c\u0435\u043d\u0438\u043b\u0438 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044e. 
 regkey.missing=\u041e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u044b\u0439 \u043a\u043b\u044e\u0447. \u0417\u0430\u043f\u0440\u043e\u0441\u0438\u0442\u0435, \u043f\u043e\u0436\u0430\u0439\u043b\u0443\u0441\u0442\u0430, \u043d\u043e\u0432\u044b\u0439.
 regkey.missingentry=\u0414\u0430\u043d\u043d\u044b\u0439 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u044b\u0439 \u043a\u043b\u044e\u0447 \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442. \u0417\u0430\u043f\u0440\u043e\u0441\u0438\u0442\u0435, \u043f\u043e\u0436\u0430\u0439\u043b\u0443\u0441\u0442\u0430, \u043d\u043e\u0432\u044b\u0439 \u043a\u043b\u044e\u0447.
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_sq.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_sq.properties
index 31d77290c5ac7b0d53e449830d6e5376230bff28..110cba980942f30fc6e4995d7c69b59b876e7c1f 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_sq.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_sq.properties
@@ -40,7 +40,7 @@ pwkey.missingentry=\u00C7el\u00EBsi p\u00EBr nd\u00EBrrimin e OpenOLAT fjal\u00E
 reg.body=<p>Faleminderit p\u00EBr interesimin tuaj n\u00EB OpenOLAT.</p>Ju lutemi shfryt\u00EBzoni lidhjen {3}<br>t\u00EB kompletoni regjistrimin.</p><p>N\u00EB rast se nuk doni t\u00EB regjistroheni, vet\u00EBm injoroni k\u00EBt\u00EB e-mail.</p><p>Ekipi juaj i OpenOLAT.</p>
 reg.notiEmail.subject=Shfryt\u00EBzues i ri i OpenOLAT-it \: {1} {2} ({0})
 reg.subject=\u00C7el\u00EBsi i regjistrimit p\u00EBr OpenOLAT
-reg.wherefrom=Kjo k\u00EBrkes\u00EB p\u00EBr regjistrim tek serveri {0} \u00EBsht\u00EB b\u00EBr\u00EB m\u00EB {1} \nnga IP adresa {2}.
+reg.wherefrom=Kjo k\u00EBrkes\u00EB p\u00EBr regjistrim tek serveri {0} \u00EBsht\u00EB b\u00EBr\u00EB m\u00EB {1}.
 registration.form.cancelled=Ju keni anuluar procesin e regjistrimit.
 regkey.missing=\u00C7el\u00EBsi i regjistrimit mungon. Ju lutemi k\u00EBrkoni nj\u00EB tjet\u00EBr.
 regkey.missingentry=Ky qel\u00EBs regjistrimi nuk ekziston. Ju lutemi k\u00EBrkoni nj\u00EB tjeter.
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_zh_CN.properties
index d306d4144c5cc16bdaa8ff1d7e089287aba6cb05..45ec390b81beff8aca66376855c46a66281bb321 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_zh_CN.properties
@@ -67,7 +67,7 @@ reg.error.title=\u5DF2\u53D6\u6D88\u6CE8\u518C
 reg.error.user_in_use=\u6B64\u7528\u6237\u540D\u5DF2\u7ECF\u5B58\u5728
 reg.notiEmail.subject=\u65B0OpenOLAT\u7528\u6237\uFF1A {1} {2} {{0}}
 reg.subject=OpenOLAT\u7684\u6CE8\u518C\u5BC6\u94A5\u3002
-reg.wherefrom=\u8FD9\u4E2A\u8BF7\u6C42\u670D\u52A1\u7684\u6CE8\u518C {0}\u5DF2\u7ECF\u5728 {1}\u4E0A\u751F\u6210 \n\u901A\u8FC7IP\u5730\u5740 {2}.
+reg.wherefrom=\u8FD9\u4E2A\u8BF7\u6C42\u670D\u52A1\u7684\u6CE8\u518C {0}\u5DF2\u7ECF\u5728 {1}\u4E0A\u751F\u6210.
 registration.form.cancelled=\u4F60\u5DF2\u7ECF\u53D6\u6D88\u6CE8\u518C\u3002
 regkey.missing=\u6CE8\u518C\u5BC6\u94A5\u4E22\u5931\uFF0C\u8BF7\u9009\u62E9\u4E00\u4E2A\u65B0\u7684\u3002
 regkey.missingentry=\u8FD9\u4E2A\u6CE8\u518C\u7684\u5BC6\u94A5\u4E0D\u5B58\u5728\uFF0C\u8BF7\u9009\u62E9\u53E6\u4E00\u4E2A\u3002
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_zh_TW.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_zh_TW.properties
index 0d56908735c3067d12a9e62d3ce656aafe847b94..38c0e4f2ad1a62514a361eb464d0235f9ba61ade 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_zh_TW.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_zh_TW.properties
@@ -52,7 +52,6 @@ reg.error.title=\u53D6\u6D88\u8A3B\u518A
 reg.error.user_in_use=\u9019\u500B\u4F7F\u7528\u8005\u540D\u7A31\u5DF2\u7D93\u5B58\u5728
 reg.notiEmail.subject=\u65B0 OpenOLAT \u4F7F\u7528\u8005\uFF1A {1} {2} ({0})
 reg.subject=OpenOLAT \u8A3B\u518A\u6388\u6B0A\u78BC
-reg.wherefrom=\u5C0D\u4F3A\u670D\u5668 {0} \u7684\u9019\u500B\u8A3B\u518A\u8981\u6C42\u662F\u7522\u751F\u5728 {1} \r\n\u4F86\u81EA IP \u4F4D\u5740 {2}\u3002
 registration.form.cancelled=\u60A8\u5DF2\u53D6\u6D88\u4E86\u8A3B\u518A\u6D41\u7A0B\u3002
 regkey.missing=\u6C92\u6709\u8A3B\u518A\u6388\u6B0A\u78BC\u3002\u8ACB\u518D\u8981\u4E00\u500B\u65B0\u7684\u3002
 regkey.missingentry=\u9019\u500B\u8A3B\u518A\u6388\u6B0A\u78BC\u4E26\u4E0D\u5B58\u5728\u3002\u8ACB\u518D\u8981\u4E00\u500B\u5176\u4ED6\u7684\u3002
diff --git a/src/main/java/org/olat/restapi/security/RestApiSessionListener.java b/src/main/java/org/olat/restapi/security/RestApiSessionListener.java
index 95f7d1067f16e201345bc929bbea72fb9bb599a3..3ce053ffba396c8fa34322ce2720fff9fc2a8a6a 100644
--- a/src/main/java/org/olat/restapi/security/RestApiSessionListener.java
+++ b/src/main/java/org/olat/restapi/security/RestApiSessionListener.java
@@ -26,11 +26,6 @@ import javax.servlet.http.HttpSessionListener;
 import org.olat.core.CoreSpringFactory;
 
 /**
- * 
- * Description:<br>
- * TODO: srosse Class Description for RestApiSessionListener
- * 
- * <P>
  * Initial Date:  7 apr. 2010 <br>
  * @author srosse, stephane.rosse@frentix.com
  */
diff --git a/src/main/java/org/olat/user/ProfileFormController.java b/src/main/java/org/olat/user/ProfileFormController.java
index af3cc97748ebad4da3298128098fc9026914c3ff..bb9140f43c818160934f42f9d6c40b1b15a26f25 100644
--- a/src/main/java/org/olat/user/ProfileFormController.java
+++ b/src/main/java/org/olat/user/ProfileFormController.java
@@ -576,7 +576,7 @@ public class ProfileFormController extends FormBasicController {
 		String currentEmailDisplay = userManager.getUserDisplayEmail(currentEmail, getLocale());
 		String changedEmaildisplay = userManager.getUserDisplayEmail(changedEmail, getLocale());
 		body = translate("email.change.body", new String[] { link, time, currentEmailDisplay, changedEmaildisplay })
-				+ SEPARATOR + translate("email.change.wherefrom", new String[] { serverpath, today, ip });
+				+ SEPARATOR + translate("email.change.wherefrom", new String[] { serverpath, today });
 		subject = translate("email.change.subject");
 		// send email
 		try {
diff --git a/src/main/java/org/olat/user/_i18n/LocalStrings_ar.properties b/src/main/java/org/olat/user/_i18n/LocalStrings_ar.properties
index 9429c3c104809b75e5fcb84197ec3da491762cf8..8a4d38f35b1d1b91f76970909666f509bc010056 100644
--- a/src/main/java/org/olat/user/_i18n/LocalStrings_ar.properties
+++ b/src/main/java/org/olat/user/_i18n/LocalStrings_ar.properties
@@ -14,7 +14,7 @@ email.change.dialog.title=\u062A\u063A\u064A\u064A\u0631 \u0639\u0646\u0648\u062
 email.change.form.info=\u0628\u0639\u062F\u060C \u064A\u0631\u062C\u0649 \u0627\u062A\u0628\u0627\u0639 \u0627\u0644\u062A\u0639\u0644\u064A\u0645\u0627\u062A \u0627\u0644\u0645\u0648\u062C\u0648\u062F\u0629 \u0641\u0649 \u0627\u0644\u0631\u0633\u0627\u0644\u0629 \u0644\u062A\u0641\u0639\u064A\u0644 \u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0628\u0631\u064A\u062F \u0627\u0644\u0627\u0644\u0643\u062A\u0631\u0648\u0646\u0649 \u0627\u0644\u062C\u062F\u064A\u062F \u0627\u0644\u062E\u0627\u0635 \u0628\u0643. <b>{0}</b> \u0644\u0645 \u064A\u062A\u0645 \u062A\u0646\u0634\u064A\u0637 \u0639\u0646\u0648\u0627\u0646 \u0628\u0631\u064A\u062F\u0643 \u0627\u0644\u0627\u0644\u0643\u062A\u0631\u0648\u0646\u0649 \u0627\u0644\u062C\u062F\u064A\u062F
 email.change.reminder=\u0644\u0642\u062F \u0642\u0645\u062A \u0628\u0625\u062C\u0631\u0627\u0621 \u062A\u0639\u062F\u064A\u0644\u0627\u062A \u0639\u0644\u0649 \u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0628\u0631\u064A\u062F \u0627\u0644\u0627\u0644\u0643\u062A\u0631\u0648\u0646\u0649 \u0627\u0644\u062E\u0627\u0635 \u0628\u0643 \u0641\u0649 \u0623\u0648\u0644\u0627\u062A\u060C \u0648\u0644\u0643\u0646 \u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u062C\u062F\u064A\u062F \u0644\u0645 \u064A\u062A\u0645 \u062A\u0641\u0639\u064A\u0644\u0647 \u0628\u0639\u062F\u060C \u0648\u0644\u0645\u0632\u064A\u062F \u0645\u0646 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062A \u0641\u0625\u0646\u0647 \u064A\u0631\u062C\u0649 \u0627\u0633\u062A\u062E\u062F\u0627\u0645 \u0627\u0644\u0645\u0633\u0627\u0639\u062F\u0629 \u0641\u0649 \u0627\u0644\u0633\u064A\u0627\u0642 \u0627\u0644\u0645\u0648\u062C\u0648\u062F\u0629 \u0641\u0649 \u0642\u0633\u0645 "\u0627\u0644\u0635\u0641\u062D\u0629 \u0627\u0644\u0631\u0626\u064A\u0633\u064A\u0629" -> "\u0625\u0639\u062F\u0627\u062F\u0627\u062A\u0649".
 email.change.subject=[OLAT] \u062A\u0641\u0639\u064A\u0644 \u0639\u0646\u0648\u0627\u0646 \u0628\u0631\u064A\u062F\u0643 \u0627\u0644\u0627\u0644\u0643\u062A\u0631\u0648\u0646\u0649 \u0627\u0644\u062C\u062F\u064A\u062F
-email.change.wherefrom=\u0647\u0630\u0627 \u0627\u0644\u0627\u0633\u062A\u0641\u0633\u0627\u0631 \u0625\u0644\u0649 \u0627\u0644\u0633\u064A\u0631\u0641\u0631 {0} \u062A\u0645 \u0627\u0631\u0633\u0627\u0644\u0647 \u0641\u0649 {1}\r\n {2} \u0645\u0646 \u0639\u0646\u0648\u0627\u0646IP
+email.change.wherefrom=\u0647\u0630\u0627 \u0627\u0644\u0627\u0633\u062A\u0641\u0633\u0627\u0631 \u0625\u0644\u0649 \u0627\u0644\u0633\u064A\u0631\u0641\u0631 {0} \u062A\u0645 \u0627\u0631\u0633\u0627\u0644\u0647 \u0641\u0649 {1}
 email.notsent=\u0647\u0630\u0627 \u0627\u0644\u0628\u0631\u064A\u062F \u0627\u0644\u0627\u0644\u0643\u062A\u0631\u0648\u0646\u0649 \u0644\u0627 \u064A\u0645\u0643\u0646 \u0627\u0631\u0633\u0627\u0644\u0647.
 email.sent=\u062A\u0645 \u0625\u0631\u0633\u0627\u0644 \u0627\u0644\u0628\u0631\u064A\u062F \u0627\u0644\u0627\u0644\u0643\u062A\u0631\u0648\u0646\u0649 \u0628\u0646\u062C\u0627\u062D.
 error.change.email=\u062A\u0645 \u0627\u0633\u062A\u062E\u062F\u0627\u0645 \u0631\u0627\u0628\u0637 \u0627\u0644\u062A\u0641\u0639\u064A\u0644 \u0628\u0627\u0644\u0641\u0639\u0644 \u0648\u0644\u0630\u0644\u0643 \u0641\u0647\u0648 \u063A\u064A\u0631 \u0635\u0627\u0644\u062D.
diff --git a/src/main/java/org/olat/user/_i18n/LocalStrings_bg.properties b/src/main/java/org/olat/user/_i18n/LocalStrings_bg.properties
index ef4e74a07a138bf89745614ac7295393e67085d4..708d4fcef48b8f142d2fa264525c8aa4b117763d 100644
--- a/src/main/java/org/olat/user/_i18n/LocalStrings_bg.properties
+++ b/src/main/java/org/olat/user/_i18n/LocalStrings_bg.properties
@@ -14,7 +14,7 @@ email.change.dialog.title=\u041F\u0440\u043E\u043C\u044F\u043D\u0430 \u043D\u043
 email.change.form.info=\u0412\u0430\u0448\u0438\u044F\u0442 \u0438-\u043C\u0435\u0439\u043B \u0430\u0434\u0440\u0435\u0441 <b>{0}</b> \u043D\u0435 \u0435 \u0430\u043A\u0442\u0438\u0432\u0438\u0440\u0430\u043D \u0432\u0441\u0435 \u043E\u0449\u0435. \u041C\u043E\u043B\u044F, \u0441\u043B\u0435\u0434\u0432\u0430\u0439\u0442\u0435 \u0438\u043D\u0441\u0442\u0440\u0443\u043A\u0446\u0438\u0438\u0442\u0435 \u0432 \u0441\u044A\u043E\u0431\u0449\u0435\u043D\u0438\u0435\u0442\u043E, \u0437\u0430 \u0434\u0430 \u0430\u043A\u0442\u0438\u0432\u0438\u0440\u0430\u0442\u0435 \u0432\u0430\u0448\u0438\u044F \u043D\u043E\u0432 \u0438-\u043C\u0435\u0439\u043B \u0430\u0434\u0440\u0435\u0441.
 email.change.reminder=\u0412\u0438\u0435 \u0441\u0442\u0435 \u043D\u0430\u043F\u0440\u0430\u0432\u0438\u043B\u0438 \u043F\u043E\u0441\u0442\u044A\u043F\u043A\u0438 \u0437\u0430 \u043F\u0440\u043E\u043C\u044F\u043D\u0430 \u043D\u0430 \u0432\u0430\u0448\u0438\u044F \u0438-\u043C\u0435\u0439\u043B \u0430\u0434\u0440\u0435\u0441 \u0432 \u0441\u0438\u0441\u0442\u0435\u043C\u0430\u0442\u0430, \u043E\u0431\u0430\u0447\u0435, \u0432\u0430\u0448\u0438\u044F\u0442 \u043D\u043E\u0432 \u0430\u0434\u0440\u0435\u0441 \u043D\u0435 \u0435 \u0430\u043A\u0442\u0438\u0432\u0438\u0440\u0430\u043D \u0432\u0441\u0435 \u043E\u0449\u0435. \u0417\u0430 \u043F\u043E\u0432\u0435\u0447\u0435 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F, \u043C\u043E\u043B\u044F, \u043E\u0442\u0438\u0434\u0435\u0442\u0435 \u043D\u0430 \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0443\u0430\u043B\u043D\u043E-\u0447\u0443\u0432\u0441\u0442\u0432\u0438\u0442\u0435\u043B\u043D\u0430\u0442\u0430 \u043F\u043E\u043C\u043E\u0449 \u0432 \u0441\u0435\u043A\u0446\u0438\u044F\u0442\u0430 "\u041D\u0430\u0447\u0430\u043B\u043E" \u2192 "\u041C\u043E\u0438\u0442\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438".
 email.change.subject=\u0410\u043A\u0442\u0438\u0432\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u0432\u0430\u0448\u0438\u044F \u043D\u043E\u0432 \u0438-\u043C\u0435\u0439\u043B \u0430\u0434\u0440\u0435\u0441
-email.change.wherefrom=\u0422\u043E\u0432\u0430 \u0442\u044A\u0440\u0441\u0435\u043D\u0435 \u043D\u0430 \u0441\u044A\u0440\u0432\u044A\u0440 {0} \u0435 \u0438\u0437\u043F\u0440\u0430\u0442\u0435\u043D\u043E \u043D\u0430 {1} \r\n\u043E\u0442 IP \u0430\u0434\u0440\u0435\u0441 {2}.
+email.change.wherefrom=\u0422\u043E\u0432\u0430 \u0442\u044A\u0440\u0441\u0435\u043D\u0435 \u043D\u0430 \u0441\u044A\u0440\u0432\u044A\u0440 {0} \u0435 \u0438\u0437\u043F\u0440\u0430\u0442\u0435\u043D\u043E \u043D\u0430 {1}.
 email.notsent=\u0422\u043E\u0432\u0430 \u0438-\u043C\u0435\u0439\u043B \u0441\u044A\u043E\u0431\u0449\u0435\u043D\u0438\u0435 \u043D\u0435 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0438\u0437\u043F\u0440\u0430\u0442\u0435\u043D\u043E.
 email.sent=\u0418-\u043C\u0435\u0439\u043B \u0441\u044A\u043E\u0431\u0449\u0435\u043D\u0438\u0435\u0442\u043E \u0435 \u0438\u0437\u043F\u0440\u0430\u0442\u0435\u043D\u043E \u0443\u0441\u043F\u0435\u0448\u043D\u043E.
 error.change.email=\u0422\u0430\u0437\u0438 \u0432\u0440\u044A\u0437\u043A\u0430 \u0437\u0430 \u0430\u043A\u0442\u0438\u0432\u0438\u0440\u0430\u043D\u0435 \u0435 \u0432\u0435\u0447\u0435 \u0438\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u043D\u0430 \u0438 \u043F\u043E\u0440\u0430\u0434\u0438 \u0442\u043E\u0432\u0430 \u0435 \u043D\u0435\u0432\u0430\u043B\u0438\u0434\u043D\u0430.
diff --git a/src/main/java/org/olat/user/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/user/_i18n/LocalStrings_de.properties
index e390a00bc6afb3404243cfba949af0e5e5fa401d..92b1c2265664fbfee72e5935897e67f5b3dd51ca 100644
--- a/src/main/java/org/olat/user/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/user/_i18n/LocalStrings_de.properties
@@ -14,7 +14,7 @@ email.change.dialog.title=\u00C4nderung der E-Mail-Adresse
 email.change.form.info=Ihre neue E-Mail-Adresse <b>{0}</b> wurde noch nicht aktiviert. Bitte folgen Sie den Anweisungen in der Ihnen zugestellten E-Mail zur Aktivierung der neuen E-Mail-Adresse.
 email.change.reminder=Sie haben die \u00C4nderung Ihrer in OpenOLAT hinterlegten E-Mail-Adresse beantragt, die neue Adresse jedoch noch nicht aktiviert. Weitere Informationen zu diesem Vorgang finden Sie in der kontextsensitiven Hilfe im Bereich "Home" \u2192 "Meine Einstellungen".
 email.change.subject=[OLAT] Aktivierung Ihrer neuen E-Mail-Adresse
-email.change.wherefrom=Diese Anfrage an den Server {0} wurde am {1} \nvon der IP-Adresse {2} abgeschickt.
+email.change.wherefrom=Diese Anfrage an den Server {0} wurde am {1} abgeschickt.
 email.not.available=n/a
 email.notsent=Die E-Mail konnte nicht versendet werden.
 email.sent=Die E-Mail wurde erfolgreich versendet.
diff --git a/src/main/java/org/olat/user/_i18n/LocalStrings_el.properties b/src/main/java/org/olat/user/_i18n/LocalStrings_el.properties
index bc3f55c76d04a107b151b312329f25db93ae26ea..b4f764cc2aae6bae4c6a82e4d26ec40a831cb47d 100644
--- a/src/main/java/org/olat/user/_i18n/LocalStrings_el.properties
+++ b/src/main/java/org/olat/user/_i18n/LocalStrings_el.properties
@@ -14,7 +14,7 @@ email.change.dialog.title=\u0391\u03BB\u03BB\u03B1\u03B3\u03AE \u03BC\u03B9\u03A
 email.change.form.info=\u0397 \u03BD\u03AD\u03B1 \u03C3\u03B1\u03C2 \u03B4\u03B9\u03B5\u03CD\u03B8\u03C5\u03BD\u03C3\u03B7 E-mail <b>{0}</b>\u03B4\u03B5\u03BD \u03AD\u03C7\u03B5\u03B9 \u03B5\u03BD\u03B5\u03C1\u03B3\u03BF\u03C0\u03BF\u03B9\u03B7\u03B8\u03B5\u03AF \u03B1\u03BA\u03CC\u03BC\u03B7. \u03A0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03CE, \u03B1\u03BA\u03BF\u03BB\u03BF\u03C5\u03B8\u03AE\u03C3\u03C4\u03B5 \u03C4\u03B9\u03C2 \u03BF\u03B4\u03B7\u03B3\u03AF\u03B5\u03C2 \u03C3\u03C4\u03BF \u03BC\u03AE\u03BD\u03C5\u03BC\u03AC \u03C3\u03B1\u03C2 \u03CE\u03C3\u03C4\u03B5 \u03BD\u03B1 \u03B5\u03BD\u03B5\u03C1\u03B3\u03BF\u03C0\u03BF\u03B9\u03AE\u03C3\u03B5\u03C4\u03B5 \u03C4\u03BF \u03BD\u03AD\u03BF \u03C3\u03B1\u03C2 E-mail.
 email.change.reminder=\u0388\u03C7\u03B5\u03C4\u03B5 \u03C0\u03C1\u03BF\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1\u03C4\u03AF\u03C3\u03B5\u03B9 \u03BC\u03AF\u03B1 \u03C4\u03C1\u03BF\u03C0\u03BF\u03C0\u03BF\u03AF\u03B7\u03C3\u03B7 \u03C3\u03C4\u03BF E-mail \u03C3\u03B1\u03C2 \u03C3\u03C4\u03BF OLAT, \u03C0\u03B1\u03C1\u03CC\u03BB\u03B1 \u03B1\u03C5\u03C4\u03AC, \u03B7 \u03BD\u03AD\u03B1 \u03C3\u03B1\u03C2 \u03B4\u03B9\u03B5\u03CD\u03B8\u03C5\u03BD\u03C3\u03B7 \u03B4\u03B5\u03BD \u03AD\u03C7\u03B5\u03B9 \u03B5\u03BD\u03B5\u03C1\u03B3\u03BF\u03C0\u03BF\u03B9\u03B7\u03B8\u03B5\u03AF \u03B1\u03BA\u03CC\u03BC\u03B7. \u0393\u03B9\u03B1 \u03C0\u03B5\u03C1\u03B9\u03C3\u03C3\u03CC\u03C4\u03B5\u03C1\u03B5\u03C2 \u03C0\u03BB\u03B7\u03C1\u03BF\u03C6\u03BF\u03C1\u03AF\u03B5\u03C2, \u03C0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03CE \u03C7\u03C1\u03B7\u03C3\u03B9\u03BC\u03BF\u03C0\u03BF\u03B9\u03AE\u03C3\u03C4\u03B5 \u03C4\u03B7 \u03B2\u03BF\u03AE\u03B8\u03B5\u03B9\u03B1 \u03B3\u03B9\u03B1 \u03C4\u03BF \u03B5\u03C5\u03B1\u03AF\u03C3\u03B8\u03B7\u03C4\u03BF \u03C0\u03B5\u03C1\u03B9\u03B5\u03C7\u03CC\u03BC\u03B5\u03BD\u03BF \u03C3\u03C4\u03BF \u03C4\u03BC\u03AE\u03BC\u03B1 "\u0391\u03C1\u03C7\u03B9\u03BA\u03AE \u03A3\u03B5\u03BB\u03AF\u03B4\u03B1 \u2192 "\u039F\u03B9 \u03A1\u03C5\u03B8\u03BC\u03AF\u03C3\u03B5\u03B9\u03C2 \u03BC\u03BF\u03C5".
 email.change.subject=[OLAT] \u0395\u03BD\u03B5\u03C1\u03B3\u03BF\u03C0\u03BF\u03B9\u03CE\u03BD\u03C4\u03B1\u03C2 \u03C4\u03B7 \u03BD\u03AD\u03B1 \u03C3\u03B1\u03C2 e-mail \u03B4\u03B9\u03B5\u03CD\u03B8\u03C5\u03BD\u03C3\u03B7
-email.change.wherefrom=\u0391\u03C5\u03C4\u03AE \u03B7 \u03B5\u03C1\u03CE\u03C4\u03B7\u03C3\u03B7 \u03C3\u03C4\u03BF\u03BD \u03B5\u03BE\u03C5\u03C0\u03B7\u03C1\u03B5\u03C4\u03B7\u03C4\u03AE {0} \u03AD\u03C7\u03B5\u03B9 \u03C3\u03C4\u03B1\u03BB\u03B5\u03AF \u03C3\u03B5 {1}\r\n\u03B1\u03C0\u03CC \u03C4\u03B7 \u03B4\u03B9\u03B5\u03CD\u03B8\u03C5\u03BD\u03C3\u03B7 IP {2}.
+email.change.wherefrom=\u0391\u03C5\u03C4\u03AE \u03B7 \u03B5\u03C1\u03CE\u03C4\u03B7\u03C3\u03B7 \u03C3\u03C4\u03BF\u03BD \u03B5\u03BE\u03C5\u03C0\u03B7\u03C1\u03B5\u03C4\u03B7\u03C4\u03AE {0} \u03AD\u03C7\u03B5\u03B9 \u03C3\u03C4\u03B1\u03BB\u03B5\u03AF \u03C3\u03B5 {1}\r\n\u03B1\u03C0\u03CC \u03C4\u03B7.
 email.notsent=\u03A4\u03BF e-mail \u03B4\u03B5\u03BD \u03AE\u03C4\u03B1\u03BD \u03B4\u03C5\u03BD\u03B1\u03C4\u03CC \u03BD\u03B1 \u03C3\u03C4\u03B1\u03BB\u03BB\u03B5\u03AF.
 email.sent=\u03A4\u03BF e-mail \u03B5\u03C3\u03C4\u03AC\u03BB\u03BB\u03B5\u03B9 \u03B5\u03C0\u03B9\u03C4\u03C5\u03C7\u03CE\u03C2.
 error.change.email=\u0391\u03C5\u03C4\u03CC\u03C2 \u03BF \u03C3\u03CD\u03BD\u03B4\u03B5\u03C3\u03BC\u03BF\u03C2 \u03B5\u03BD\u03B5\u03C1\u03B3\u03BF\u03C0\u03BF\u03AF\u03B7\u03C3\u03B7\u03C2 \u03AD\u03C7\u03B5\u03B9 \u03AE\u03B4\u03B7 \u03C7\u03C1\u03B7\u03C3\u03B9\u03BC\u03BF\u03C0\u03BF\u03B9\u03B7\u03B8\u03B5\u03AF \u03BA\u03B1\u03B9 \u03C3\u03C5\u03BD\u03B5\u03C0\u03CE\u03C2 \u03B4\u03B5\u03BD \u03B5\u03AF\u03BD\u03B1\u03B9 \u03AD\u03B3\u03BA\u03C5\u03C1\u03BF\u03C2.
diff --git a/src/main/java/org/olat/user/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/user/_i18n/LocalStrings_en.properties
index 0160f5d573a56bc8833315589bc4fd39a7a0ed3e..7fa4573acf7e02a54392e3c4544b53b8ad5f64ab 100644
--- a/src/main/java/org/olat/user/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/user/_i18n/LocalStrings_en.properties
@@ -14,7 +14,7 @@ email.change.dialog.title=Modification of an E-mail address
 email.change.form.info=Your new E-mail address <b>{0}</b> has not been activated yet. Please follow the instructions in your message to activate your new E-mail address.
 email.change.reminder=You have arranged for a modification of your E-mail address in OpenOLAT, however, your new address has not been activated yet. For further information please use the context-sensitive Help in the section "Home" \u2192 "My settings".
 email.change.subject=[OLAT] Activating your new E-mail address
-email.change.wherefrom=This query to server {0} has been sent on {1} \r\nfrom the IP address {2}.
+email.change.wherefrom=This query to server {0} has been sent on {1}.
 email.not.available=n/a
 email.notsent=This E-mail could not be sent.
 email.sent=E-mail sent successfully.
diff --git a/src/main/java/org/olat/user/_i18n/LocalStrings_es.properties b/src/main/java/org/olat/user/_i18n/LocalStrings_es.properties
index 01852a7e174fb54920a174e0ff7a30375c29a5f0..ae7dd65a8128803e53866cce60b81960bfc35460 100644
--- a/src/main/java/org/olat/user/_i18n/LocalStrings_es.properties
+++ b/src/main/java/org/olat/user/_i18n/LocalStrings_es.properties
@@ -14,7 +14,7 @@ email.change.dialog.title=Modificaci\u00F3n de una direcci\u00F3n de email
 email.change.form.info=Su nueva direcci\u00F3n de e-mail <b>{0}</b> no ha sido activada a\u00FAn. Por favor siga las instrucciones en su mensaje para activar su nueva direcci\u00F3n.
 email.change.reminder=Ha solicitado una modificaci\u00F3n de su direcci\u00F3n de e-mail en OLAT, sin embargo, su nueva direcci\u00F3n no ha sido activada a\u00FAn. Para m\u00E1s informaci\u00F3n por favor utilice la Ayuda de contexto-sensitiva en la secci\u00F3n "Inicio" \u2192 "Mis preferencias".
 email.change.subject=[OLAT] Activando su nueva direcci\u00F3n de correo
-email.change.wherefrom=Esta consulta al servidor {0} ha sido enviada al {1} \r\ndesde la direcci\u00F3n IP {2}.
+email.change.wherefrom=Esta consulta al servidor {0} ha sido enviada al {1}.
 email.notsent=Este email no pudo ser enviado.
 email.sent=Email enviado satisfactoriamente.
 error.change.email=Este enlace de activaci\u00F3n ya se ha utilizado y por tanto es inv\u00E1lido.
diff --git a/src/main/java/org/olat/user/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/user/_i18n/LocalStrings_fr.properties
index e1bc04fb16d46785159bf2e07bbfd29018ca5538..7cbe6ba565aa7dc6a3100f2ee558358ad8aa5162 100644
--- a/src/main/java/org/olat/user/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/user/_i18n/LocalStrings_fr.properties
@@ -14,7 +14,7 @@ email.change.dialog.title=Modification de l'adresse e-mail
 email.change.form.info=Votre nouvel e-mail <b>{0}</b> n'a pas encore \u00E9t\u00E9 activ\u00E9. Veuillez suivre les indications dans le message qui vous avez \u00E9t\u00E9 envoy\u00E9 pour l'activation du nouvel e-mail.
 email.change.reminder=Vous avez demand\u00E9 le changement de votre e-mail indiqu\u00E9 dans OLAT, mais vous ne l'avez pas encore activ\u00E9. Pour plus d'informations, voir l'aide contextuelle sous Accueil -> Mes r\u00E9glages.
 email.change.subject=[OLAT] Activation du nouvel e-mail
-email.change.wherefrom=Cette demande au serveur {0} a \u00E9t\u00E9 envoy\u00E9 le {1} depuis l'adresse IP {2}.
+email.change.wherefrom=Cette demande au serveur {0} a \u00E9t\u00E9 envoy\u00E9 le {1}.
 email.not.available=n/a
 email.notsent=L'e-mail n'a pas pu \u00EAtre envoy\u00E9
 email.sent=L'e-mail a \u00E9t\u00E9 envoy\u00E9 avec succ\u00E8s.
diff --git a/src/main/java/org/olat/user/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/user/_i18n/LocalStrings_it.properties
index 867bede56482aedc55d44f850e91d7c07f4f5eb9..c3a0cf09cb8059b2b1b8057bc4f5b12ea359184f 100644
--- a/src/main/java/org/olat/user/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/user/_i18n/LocalStrings_it.properties
@@ -14,7 +14,7 @@ email.change.dialog.title=Modificazione dell'indirizzo e-mail
 email.change.form.info=Il Suo indirizzo e-mail <b>{0}</b>non \u00E8 stato ancora attivato. La preghiamo di seguire le istruzioni nella e-mail che Le abbiamo inviato per l'attivazione del Suo nuovo indirizzo.
 email.change.reminder=Lei ha richiesto la modificazione del Suo indirizzo e-mail OLAT, ma non ha ancora attivato il nuovo indirizzo. Trova ulteriori informazioni su questa operazione nell'aiuto contestuale OLAT alla sezione "Pagina iniziale" \u2192 "Preferenze".
 email.change.subject=[OLAT] Attivazione del nuovo indirizzo e-mail
-email.change.wherefrom=Questa richiesta al server {0} \u00E8 stata inviata il {1} \r\ndall'indirizzo IP {2}.
+email.change.wherefrom=Questa richiesta al server {0} \u00E8 stata inviata il {1}.
 email.notsent=Non \u00E8 stato possibile inviare questa e-mail.
 email.sent=Il messaggio \u00E8 stato inviato.
 error.change.email=Questo link di attivazione \u00E8 gi\u00E0 stato utilizzato e dunque non pi\u00F9 valido.
diff --git a/src/main/java/org/olat/user/_i18n/LocalStrings_nl_NL.properties b/src/main/java/org/olat/user/_i18n/LocalStrings_nl_NL.properties
index 412b9888ea5061bc344e0b7742749ebd58d04fe8..64d60109315d16fe7ce1ad7c4b8ec1749963b04e 100644
--- a/src/main/java/org/olat/user/_i18n/LocalStrings_nl_NL.properties
+++ b/src/main/java/org/olat/user/_i18n/LocalStrings_nl_NL.properties
@@ -14,7 +14,7 @@ email.change.dialog.title=Verandering van een e-mailadres
 email.change.form.info=Uw nieuw e-mailadres <b>{0}</b> werd nog niet geactiveerd. Gelieve instructies in uw bericht te volgen om uw nieuw e-mailadres te activeren.
 email.change.reminder=U hebt een verandering van e-mailadres in OLAT geregeld, hoewel, uw nieuw e-mailadres nog niet geactiveerd werd. Voor verdere informatie, gelieve de context-gevoelige Help te gebruiken in de sectie "Home" \u2192 "Mijn instellingen".
 email.change.subject=[OLAT] Uw nieuw e-mailadres activeren
-email.change.wherefrom=Deze vraag aan server {0} werd gestuurd op {0}\r\nvan het IP adres {2}.
+email.change.wherefrom=Deze vraag aan server {0} werd gestuurd op {1}.
 email.notsent=Deze e-mail kon niet verstuurd worden.
 email.sent=E-mail werd succesvol verzonden.
 error.change.email=Deze geactiveerde link werd al gebruikt en is daarom ongeldig.
diff --git a/src/main/java/org/olat/user/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/user/_i18n/LocalStrings_pl.properties
index 075c8866b1b568131aadb5189d33f7e197193133..a4893bac1e5ba99c72c1c7069971899d0eed9169 100644
--- a/src/main/java/org/olat/user/_i18n/LocalStrings_pl.properties
+++ b/src/main/java/org/olat/user/_i18n/LocalStrings_pl.properties
@@ -14,7 +14,7 @@ email.change.dialog.title=Zmiana adresu e-mail
 email.change.form.info=Tw\u00F3j nowy e-mail <b>{0}</b> nie zosta\u0142 jeszcze aktywowany. Post\u0119puj zgodnie z instrukcj\u0105, wys\u0142an\u0105 pod zmieniony adres.
 email.change.reminder=Dokona\u0142e\u015B zmiany adresu e-mail, jednak nie zosta\u0142 jeszcze aktywowany. \u017Beby otrzyma\u0107 wi\u0119cej informacji, u\u017Cyj Pomocy kontekstowej w sekcji "Ustawienia" (Strona domowa \u2192 Ustawienia).
 email.change.subject=[OLAT] Aktywacja nowego adresu e-mail
-email.change.wherefrom=To zapytanie do serwera {0} zosta\u0142o wys\u0142ane {1} z adresu IP {2}.
+email.change.wherefrom=To zapytanie do serwera {0} zosta\u0142o wys\u0142ane {1}.
 email.notsent=Ten e-mail nie m\u00F3g\u0142 zosta\u0107 wys\u0142any.
 email.sent=Wys\u0142ano pomy\u015Blnie.
 error.change.email=Ten link aktywacyjny zosta\u0142 ju\u017C raz wykorzystany, wi\u0119c jest ju\u017C nieaktualny.
diff --git a/src/main/java/org/olat/user/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/user/_i18n/LocalStrings_pt_BR.properties
index 532165dc757a0030891650e81be197179fe59b3f..354e5e7f44ae6a639a5af6b43bd143f0b68a42ea 100644
--- a/src/main/java/org/olat/user/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/user/_i18n/LocalStrings_pt_BR.properties
@@ -14,7 +14,7 @@ email.change.dialog.title=Modifica\u00E7\u00E3o de endere\u00E7o de E-mail
 email.change.form.info=Seu novo endere\u00E7o de e-mail <b>{0}</b>n\u00E3o foi ativado ainda. Por favor, siga as instru\u00E7\u00F5es na mensagem para ativar seu novo endere\u00E7o de e-mail.
 email.change.reminder=Voc\u00EA solicitou uma altera\u00E7\u00E3o do seu endere\u00E7o de e-mail no OLAT, no entanto, o seu novo endere\u00E7o ainda n\u00E3o foi ativado. Para mais informa\u00E7\u00F5es, por favor, use a Ajuda com contexto-sens\u00EDveis na se\u00E7\u00E3o "Home" \u2192 "Minha configura\u00E7\u00F5es".
 email.change.subject=[OLAT] Ativando o seu novo endere\u00E7o de e-mail
-email.change.wherefrom=Esta consulta ao servidor {0} foi enviada em {1} \r\ndo endere\u00E7o IP {2}.
+email.change.wherefrom=Esta consulta ao servidor {0} foi enviada em {1}.
 email.not.available=n/a
 email.notsent=O E-mail n\u00E3o pode ser enviado
 email.sent=E-mail enviado com sucesso.
diff --git a/src/main/java/org/olat/user/_i18n/LocalStrings_ru.properties b/src/main/java/org/olat/user/_i18n/LocalStrings_ru.properties
index 526a4b0fed2581bf3c10cc5a49795226ef3b1bea..69c104f9b9974189f1e965188d20970770d4d825 100644
--- a/src/main/java/org/olat/user/_i18n/LocalStrings_ru.properties
+++ b/src/main/java/org/olat/user/_i18n/LocalStrings_ru.properties
@@ -14,7 +14,7 @@ email.change.dialog.title=\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u0435
 email.change.form.info=\u0412\u0430\u0448 \u043D\u043E\u0432\u044B\u0439 \u0435-mail \u0430\u0434\u0440\u0435\u0441 <b>{0}</b> \u0435\u0449\u0435 \u043D\u0435 \u0431\u044B\u043B \u0430\u043A\u0442\u0438\u0432\u0438\u0440\u043E\u0432\u0430\u043D. \u041F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430, \u0441\u043B\u0435\u0434\u0443\u0439\u0442\u0435 \u0443\u043A\u0430\u0437\u0430\u043D\u0438\u044F\u043C \u0432 \u043F\u0440\u0438\u0441\u043B\u0430\u043D\u043D\u043E\u043C \u0412\u0430\u043C \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0438.
 email.change.reminder=\u0412\u044B \u0441\u0434\u0435\u043B\u0430\u043B\u0438 \u0437\u0430\u043F\u0440\u043E\u0441 \u043D\u0430 \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u0435 \u0412\u0430\u0448\u0435\u0433\u043E \u0435-mail \u0430\u0434\u0440\u0435\u0441\u0430 \u0432 \u0441\u0438\u0441\u0442\u0435\u043C\u0435 OLAT, \u043D\u043E \u0435\u0449\u0435 \u043D\u0435 \u0430\u043A\u0442\u0438\u0432\u0438\u0440\u043E\u0432\u0430\u043B\u0438 \u043D\u043E\u0432\u044B\u0439 \u0430\u0434\u0440\u0435\u0441. \u0414\u0430\u043B\u044C\u043D\u0435\u0439\u0448\u0443\u044E \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044E \u043F\u043E \u044D\u0442\u043E\u0439 \u043F\u0440\u043E\u0446\u0435\u0434\u0443\u0440\u0435 \u0412\u044B \u043D\u0430\u0439\u0434\u0435\u0442\u0435 \u0432 \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442-\u0441\u043F\u0440\u0430\u0432\u043A\u0435 \u043D\u0430 \u0414\u043E\u043C\u0430\u0448\u043D\u0435\u0439 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0435 \u0432 \u0440\u0430\u0437\u0434\u0435\u043B\u0435 "\u041C\u043E\u0438 \u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438".
 email.change.subject=[OLAT] \u0410\u043A\u0442\u0438\u0432\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u0412\u0430\u0448\u0435\u0433\u043E \u043D\u043E\u0432\u043E\u0433\u043E \u0435-mail \u0430\u0434\u0440\u0435\u0441\u0430
-email.change.wherefrom=\u042D\u0442\u043E\u0442 \u0437\u0430\u043F\u0440\u043E\u0441 \u0431\u044B\u043B \u043F\u043E\u0441\u043B\u0430\u043D \u043D\u0430 \u0441\u0435\u0440\u0432\u0435\u0440 {0} {1} \r\n\u0441 IP-\u0430\u0434\u0440\u0435\u0441\u0430 {2}.
+email.change.wherefrom=\u042D\u0442\u043E\u0442 \u0437\u0430\u043F\u0440\u043E\u0441 \u0431\u044B\u043B \u043F\u043E\u0441\u043B\u0430\u043D \u043D\u0430 \u0441\u0435\u0440\u0432\u0435\u0440 {0} {1}.
 email.notsent=\u042D\u0442\u043E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 \u043D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u0431\u044B\u043B\u043E \u043E\u0442\u043E\u0441\u043B\u0430\u0442\u044C.
 email.sent=\u0421\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 \u0443\u0441\u043F\u0435\u0448\u043D\u043E \u043E\u0442\u043E\u0441\u043B\u0430\u043D\u043E.
 error.change.email=\u0414\u0430\u043D\u043D\u0430\u044F \u0441\u0441\u044B\u043B\u043A\u0430 \u0434\u043B\u044F \u0430\u043A\u0442\u0438\u0432\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F \u0443\u0436\u0435 \u0431\u044B\u043B\u0430 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0430 \u0438 \u043F\u043E\u044D\u0442\u043E\u043C\u0443 \u044F\u0432\u043B\u044F\u0435\u0442\u0441\u044F \u043D\u0435\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0439.
diff --git a/src/main/java/org/olat/user/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/user/_i18n/LocalStrings_zh_CN.properties
index 9da086a4077df178033831cbe37925cabedc50fd..b2a11128f9734b70c65d3ffc5982f928b55ed699 100644
--- a/src/main/java/org/olat/user/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/user/_i18n/LocalStrings_zh_CN.properties
@@ -14,7 +14,6 @@ email.change.dialog.title=\u90AE\u4EF6\u5730\u5740\u4FEE\u6539
 email.change.form.info=\u60A8\u7684\u65B0\u90AE\u4EF6\u5730\u5740<b>{0}</b>\u8FD8\u6CA1\u6709\u6FC0\u6D3B\u3002\u8BF7\u6309\u7167\u8BF4\u660E\u6765\u6FC0\u6D3B\u60A8\u7684\u65B0\u90AE\u4EF6\u5730\u5740\u3002
 email.change.reminder=\u60A8\u5DF2\u7ECF\u5728OLAT\u4E2D\u505A\u51FA\u4E86\u90AE\u4EF6\u5730\u5740\u7684\u4FEE\u6539\u3002\u7136\u800C\uFF0C\u60A8\u7684\u65B0\u90AE\u4EF6\u5730\u5740\u8FD8\u6CA1\u6709\u6FC0\u6D3B\u3002\u60F3\u83B7\u5F97\u8BE6\u60C5\uFF0C\u8BF7\u4F7F\u7528\u201C\u9996\u9875\u201D\u2192\u201C\u6211\u7684\u8BBE\u7F6E\u201D\u4E2D\u7684\u5185\u5BB9-\u654F\u611F\u5E2E\u52A9\u3002
 email.change.subject=[OLAT]\u6FC0\u6D3B\u60A8\u7684\u65B0\u90AE\u4EF6\u5730\u5740
-email.change.wherefrom=\u5BF9\u670D\u52A1\u5668{0}\u7684\u8BF7\u6C42\u5DF2\u53D1\u9001\u81F3\u261E{1}\uFF0C\u6B64\u8BF7\u6C42\u6765\u81EAIP\uFF1A{2}
 email.notsent=\u65E0\u6CD5\u53D1\u51FA\u6B64\u90AE\u4EF6\u3002
 email.sent=\u6210\u529F\u53D1\u51FA\u90AE\u4EF6\u3002
 error.change.email=\u6B64\u6FC0\u6D3B\u94FE\u63A5\u5DF2\u7ECF\u4F7F\u7528\u8FC7\uFF0C\u73B0\u5728\u5DF2\u5931\u6548\u3002
diff --git a/src/main/java/org/olat/user/_i18n/LocalStrings_zh_TW.properties b/src/main/java/org/olat/user/_i18n/LocalStrings_zh_TW.properties
index e3b87490a463bafecc05c24d9144938e9094085d..bfa0ab7c90071ab5b2c36dedee44b5e3b0a474f5 100644
--- a/src/main/java/org/olat/user/_i18n/LocalStrings_zh_TW.properties
+++ b/src/main/java/org/olat/user/_i18n/LocalStrings_zh_TW.properties
@@ -14,7 +14,6 @@ email.change.dialog.title=\u4FEE\u6539\u96FB\u5B50\u90F5\u4EF6\u5730\u5740
 email.change.form.info=\u60A8\u7684\u65B0\u96FB\u5B50\u90F5\u4EF6\u5730\u5740 <b>{0}</b> \u5C1A\u672A\u88AB\u555F\u7528\u3002\u8ACB\u6309\u7167\u60A8\u90F5\u4EF6\u4E2D\u7684\u6307\u793A\u4F86\u555F\u7528\u60A8\u7684\u65B0\u96FB\u5B50\u90F5\u4EF6\u5730\u5740\u3002
 email.change.reminder=\u60A8\u5DF2\u7D93\u5B89\u6392\u4E86\u4E00\u500B\u5C0D\u60A8\u5728 OLAT \u7684\u96FB\u5B50\u90F5\u4EF6\u5730\u5740\u7684\u4FEE\u6539\uFF0C\u4E0D\u904E\u60A8\u7684\u65B0\u5730\u5740\u5C1A\u672A\u88AB\u555F\u7528\u3002\u8981\u7372\u53D6\u66F4\u591A\u7684\u8CC7\u8A0A\u8ACB\u4F7F\u7528\u5728\u300C\u9996\u9801\u300D\u2192 \u300C\u8A2D\u5B9A\u6A94\u300D\u7684\u4E0A\u4E0B\u6587\u76F8\u95DC\u7684\u8AAA\u660E\u3002
 email.change.subject=[OLAT] \u555F\u7528\u60A8\u65B0\u7684\u96FB\u5B50\u90F5\u4EF6\u5730\u5740
-email.change.wherefrom=\u9019\u500B\u5C0D\u4F3A\u670D\u5668 {0} \u7684\u67E5\u8A62\u5DF2\u7D93\u5728 {1}\r\n\u5F9E\u4E0B\u5217\u7684 IP \u4F4D\u5740 {2} \u50B3\u9001\u3002
 email.notsent=\u9019\u500B\u96FB\u5B50\u90F5\u4EF6\u7121\u6CD5\u88AB\u767C\u9001\u3002
 email.sent=\u96FB\u5B50\u90F5\u4EF6\u767C\u9001\u6210\u529F\u3002
 error.change.email=\u9019\u500B\u555F\u7528\u9023\u7D50\u5DF2\u7D93\u88AB\u4F7F\u7528\u904E\u4E86\u56E0\u6B64\u5931\u6548\u4E86\u3002