diff --git a/src/main/java/org/gcube/portlets/admin/createusers/client/ui/RegisteredUsersTable.java b/src/main/java/org/gcube/portlets/admin/createusers/client/ui/RegisteredUsersTable.java
index f2b8a56..e30e7d7 100644
--- a/src/main/java/org/gcube/portlets/admin/createusers/client/ui/RegisteredUsersTable.java
+++ b/src/main/java/org/gcube/portlets/admin/createusers/client/ui/RegisteredUsersTable.java
@@ -271,8 +271,10 @@ public class RegisteredUsersTable extends Composite {
 
 				if(value == null)
 					return;
-
-				sb.appendHtmlConstant("<Button>Send Welcome</Button>");
+				if(!value.isPasswordChanged())
+					sb.appendHtmlConstant("<Button>Send Welcome</Button>");
+				else
+					sb.appendHtmlConstant("<Button disabled>Send Welcome</Button>");
 
 			}
 
diff --git a/src/main/java/org/gcube/portlets/admin/createusers/server/CreateUsersImpl.java b/src/main/java/org/gcube/portlets/admin/createusers/server/CreateUsersImpl.java
index 8b3a473..4ba70f6 100644
--- a/src/main/java/org/gcube/portlets/admin/createusers/server/CreateUsersImpl.java
+++ b/src/main/java/org/gcube/portlets/admin/createusers/server/CreateUsersImpl.java
@@ -227,6 +227,7 @@ public class CreateUsersImpl extends RemoteServiceServlet implements HandleUsers
 			mailMessage.setFrom(from);
 			mailMessage.setTo(to);
 
+			// TODO it would be nice to let the creator specify the message to be sent
 			String body = "<p>Dear " + username  + ",<br />" + "<br />" + 
 					"Welcome! Your new account at " + portalUrl + " is ready to be used. Your temporary password is training1, you will be asked to reset it at your first login.<br />" +
 					"<br />" + "Sincerely,<br />" +