diff --git a/src/main/java/com/eactive/apim/portal/apps/user/facade/UserManFacade.java b/src/main/java/com/eactive/apim/portal/apps/user/facade/UserManFacade.java
index 70b8554..371700a 100644
--- a/src/main/java/com/eactive/apim/portal/apps/user/facade/UserManFacade.java
+++ b/src/main/java/com/eactive/apim/portal/apps/user/facade/UserManFacade.java
@@ -142,9 +142,10 @@ public class UserManFacade {
             params.put("NAME", emailAddr);
             params.put("url", "signup/portalUser?invitation=" + token);
 
+            String emailUsername = emailAddr.contains("@") ? emailAddr.substring(0, emailAddr.indexOf("@")) : emailAddr;
             recipient = MessageRecipient.builder()
                     .userId(emailAddr)
-                    .username(emailAddr)
+                    .username(emailUsername)
                     .build();
         }