diff --git a/.classpath b/.classpath
index a2aef7d..e76f5f9 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/create-users-2.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/create-users-2.1.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -30,5 +30,5 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
-	<classpathentry kind="output" path="target/create-users-2.0.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/create-users-2.1.1-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index e9838fa..4b7cda2 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,9 +4,6 @@
         <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="gcube-widgets-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/gcube-widgets/gcube-widgets">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <property name="java-output-path" value="/create-users/target/subscribe-users-1.0.0-SNAPSHOT/WEB-INF/classes"/>
         <property name="context-root" value="create-users"/>
     </wb-module>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index 0777079..39ca881 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -2,7 +2,7 @@
 <faceted-project>
   <fixed facet="wst.jsdt.web"/>
   <installed facet="java" version="1.7"/>
-  <installed facet="jst.web" version="2.3"/>
+  <installed facet="jst.web" version="3.0"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="jst.jaxrs" version="2.0"/>
   <installed facet="liferay.portlet" version="6.0"/>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 052786e..bc54339 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,8 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets.admin.create-users.2-1-1"
+		date="2016-10-31">
+		<Change>Fixed unknown question in case of password recovery</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets.admin.create-users.2-0-0"
 		date="2016-05-31">
 		<Change>Moved to Liferay 6.2.5</Change>
diff --git a/pom.xml b/pom.xml
index c663420..e099f6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<groupId>org.gcube.portlets.admin</groupId>
 	<artifactId>create-users</artifactId>
 	<packaging>war</packaging>
-	<version>2.1.0-SNAPSHOT</version>
+	<version>2.1.1-SNAPSHOT</version>
 	<name>Create users portlet</name>
 	<description>
 		Create users portlet allows a VRE-Manager to enter user's personal data and automatically register he/she in the portal.
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 ef5c605..7ea18c9 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
@@ -324,8 +324,8 @@ public class CreateUsersImpl extends RemoteServiceServlet implements HandleUsers
 									"", 
 									"",
 									isMale, 
-									null, 
-									null,
+									"What was your default password?", 
+									"training1",
 									false, // determine if we need to send him/her an email
 									true); 	// force the password reset