diff --git a/src/main/java/eu/dnetlib/repo/manager/service/EmailUtilsImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/EmailUtilsImpl.java
index 89f4e87..353082b 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/EmailUtilsImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/EmailUtilsImpl.java
@@ -147,7 +147,8 @@ public class EmailUtilsImpl implements EmailUtils {
                 "We received a request to register the " + repository.getEoscDatasourceType() + "[" + repository.getOfficialname() + "]" +
                         " to the OpenAIRE compliant list of content providers. " +
                         "\n\n" +
-                        "User Contact: " + authentication.getName() + " (" + ((OIDCAuthenticationToken) authentication).getUserInfo().getEmail() + ")" +
+                        "User Contact: " + ((OIDCAuthenticationToken) authentication).getUserInfo().getName() +
+                        " (" + ((OIDCAuthenticationToken) authentication).getUserInfo().getEmail() + ")" +
                         "\n\n" +
                         "Please do not reply to this message\n" +
                         "This message has been generated automatically.";
@@ -196,7 +197,8 @@ public class EmailUtilsImpl implements EmailUtils {
         message += "A validation process for this interface against the OpenAIRE guidelines compatibility " +
                 "has been started. You will be informed in another message once the process is finished." +
                 "\n\n" +
-                "User Contact: " + authentication.getName() + " (" + ((OIDCAuthenticationToken) authentication).getUserInfo().getEmail() + ")" +
+                "User Contact: " + ((OIDCAuthenticationToken) authentication).getUserInfo().getName() +
+                " (" + ((OIDCAuthenticationToken) authentication).getUserInfo().getEmail() + ")" +
                 "\n\n" +
                 "Please do not reply to this message\n" +
                 "This message has been generated automatically.";
@@ -279,7 +281,7 @@ public class EmailUtilsImpl implements EmailUtils {
                         "\n\nBase URL: " + repositoryInterface.getBaseurl() +
                         "\n\nSet: " + repositoryInterface.getAccessSet() +
                         "\n\nDesired Selected Guidelines: " + getSelectedGuidelines(desiredCompatibility, repositoryInterface) +
-                        "\n\nUser Contact:" + issuerEmail + "" +
+                        "\n\nUser Contact: " + issuerEmail + "" +
                         "\n\nYou can review the validation results here.\n" + valBaseUrl + "" + jobId +
                         "\n\n\nPlease do not reply to this email\n" +
                         "This message has been generated manually\n\n" +
@@ -332,7 +334,7 @@ public class EmailUtilsImpl implements EmailUtils {
                         "\n\nBase URL: " + repositoryInterface.getBaseurl() +
                         "\n\nSet: " + repositoryInterface.getAccessSet() +
                         "\n\nSelected Guidelines: " + getSelectedGuidelines(desiredCompatibility, repositoryInterface) +
-                        "\n\nUser Contact:" + issuerEmail + "" +
+                        "\n\nUser Contact: " + issuerEmail + "" +
                         "\n\nYou can review the validation results here.\n" + valBaseUrl + "" + jobId +
                         "\n\n\nPlease do not reply to this email\n" +
                         "This message has been generated manually\n\n" +
@@ -377,7 +379,7 @@ public class EmailUtilsImpl implements EmailUtils {
                         "\n\nBase URL: " + repositoryInterface.getBaseurl() +
                         "\n\nSet: " + repositoryInterface.getAccessSet() +
                         "\n\nSelected Guidelines: " + getSelectedGuidelines(desiredCompatibility, repositoryInterface) +
-                        "\n\nUser Contact:" + issuerEmail + "" +
+                        "\n\nUser Contact: " + issuerEmail + "" +
                         "\n\nYou can review the validation results here.\n" + valBaseUrl + "" + jobId +
                         "\n\n\nPlease do not reply to this email\n" +
                         "This message has been generated manually\n\n" +
@@ -425,7 +427,7 @@ public class EmailUtilsImpl implements EmailUtils {
                         "\n\nBase URL: " + repositoryInterface.getBaseurl() +
                         "\n\nSet: " + repositoryInterface.getAccessSet() +
                         "\n\nSelected Guidelines: " + getSelectedGuidelines(desiredCompatibility, repositoryInterface) +
-                        "\n\nUser Contact:" + issuerEmail + "" +
+                        "\n\nUser Contact: " + issuerEmail + "" +
                         "\n\nYou can review the validation results here.\n" + valBaseUrl + "" + jobId +
                         "\n\n\nPlease do not reply to this email\n" +
                         "This message has been generated manually\n\n" +
@@ -507,7 +509,7 @@ public class EmailUtilsImpl implements EmailUtils {
 
         String message =
                 "a validation request has finished. You can retrieve the results by following this url: " + valBaseUrl + "" + jobId + " .\n\n" +
-                        "\n\nUser Contact:" + issuer + "" +
+                        "\n\nUser Contact: " + issuer + "" +
                         "Please do not reply to this message.\n" +
                         "This message has been generated automatically.\n" +
                         "If you have any questions, write to 'helpdesk@openaire.eu'.";
@@ -582,7 +584,8 @@ public class EmailUtilsImpl implements EmailUtils {
             message += "\nThe users comment was '" + comment + "'\n";
 
         message += "A new iteration process of the validation against the OpenAIRE guidelines compatibility has been started.\n\n" +
-                "User Contact: " + authentication.getName() + " (" + ((OIDCAuthenticationToken) authentication).getUserInfo().getEmail() + ")" +
+                "User Contact: " + ((OIDCAuthenticationToken) authentication).getUserInfo().getName() +
+                " (" + ((OIDCAuthenticationToken) authentication).getUserInfo().getEmail() + ")" +
                 "\n\n" +
                 "Please do not reply to this message\n" +
                 "This message has been generated automatically.";