diff --git a/services/webapp/code/rosetta/core_app/utils.py b/services/webapp/code/rosetta/core_app/utils.py
index 20085fea6f4df9f100054635bd05e34fc3e18b89..977cf9534dd6511f1eea55ebd8a7267d01b38142 100644
--- a/services/webapp/code/rosetta/core_app/utils.py
+++ b/services/webapp/code/rosetta/core_app/utils.py
@@ -148,7 +148,7 @@ def finalize_user_creation(user):
         logger.error(out)
         raise ErrorMessage('Something went wrong in creating user keys folder. Please contact support')
         
-    command= "/bin/bash -c \"ssh-keygen -q -t rsa -N '' -f /data/resources/keys/{}_id_rsa 2>/dev/null <<< y >/dev/null\"".format(user.username)                        
+    command= "/bin/bash -c \"ssh-keygen -q -t rsa -N '' -C {}@rosetta -f /data/resources/keys/{}_id_rsa 2>/dev/null <<< y >/dev/null\"".format(user.email.split('@')[0], user.username)                        
     out = os_shell(command, capture=True)
     if not out.exit_code == 0:
         logger.error(out)