diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 2530a4b..cf5fb55 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,6 +4,12 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <dependent-module archiveName="invites-common-library-1.5.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/invites-common-library/invites-common-library">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="email-templates-library-1.4.3.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/email-templates-library/email-templates-library">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <property name="context-root" value="accept-invite-portlet"/>
         <property name="java-output-path" value="/accept-invite-portlet/target/classes"/>
     </wb-module>
diff --git a/src/main/java/org/gcube/portlets/user/acceptinvite/InvitationAcceptedEvent.java b/src/main/java/org/gcube/portlets/user/acceptinvite/InvitationAcceptedEvent.java
index a1ebe10..b66f147 100644
--- a/src/main/java/org/gcube/portlets/user/acceptinvite/InvitationAcceptedEvent.java
+++ b/src/main/java/org/gcube/portlets/user/acceptinvite/InvitationAcceptedEvent.java
@@ -1,5 +1,7 @@
 package org.gcube.portlets.user.acceptinvite;
 
+import java.util.UUID;
+
 import org.gcube.portal.event.publisher.lr62.PortalEvent;
 
 import com.liferay.portal.security.auth.CompanyThreadLocal;
@@ -31,7 +33,12 @@ public class InvitationAcceptedEvent extends PortalEvent {
         try {
             Long companyId = PortletViewController.getCompany().getCompanyId();
             Long defaultUserId = UserLocalServiceUtil.getDefaultUserId(companyId);
-            return defaultScreenNameGenerator.generate(companyId, defaultUserId, email);
+            String screename = defaultScreenNameGenerator.generate(companyId, defaultUserId, email);
+            //here we add some random char to the screenname created
+            StringBuilder sb = new StringBuilder(screename)
+            		.append(UUID.randomUUID().toString().substring(0, 5));
+            String computedUsername =  sb.toString();
+            return computedUsername;
         } catch (Exception e) {
             log.error("Cannot generate username via screen name generator", e);
             return "";
diff --git a/src/main/webapp/images/icon.png b/src/main/webapp/images/icon.png
new file mode 100644
index 0000000..b5f5ae9
Binary files /dev/null and b/src/main/webapp/images/icon.png differ