diff --git a/src/main/java/org/gcube/vomanagement/usermanagement/UserManager.java b/src/main/java/org/gcube/vomanagement/usermanagement/UserManager.java
index 41059ee..62c5be7 100644
--- a/src/main/java/org/gcube/vomanagement/usermanagement/UserManager.java
+++ b/src/main/java/org/gcube/vomanagement/usermanagement/UserManager.java
@@ -36,7 +36,7 @@ import com.liferay.portal.model.MembershipRequest;
 	  * @return an instance of the yet created user
 	  * @throws UserManagementSystemException
 	  */
-	 GCubeUser createUser(String username, String email, String firstName, String middleName, String lastName, String jobTitle, String backgroundSummary, boolean male) throws UserManagementSystemException;
+	 GCubeUser createUser(String username, String email, String firstName, String middleName, String lastName, String jobTitle, String backgroundSummary, boolean male, String reminderQuestion, String reminderAnswer) throws UserManagementSystemException;
 	 /**
 	  * 
 	  * @param username the username of the user you want to get
diff --git a/src/main/java/org/gcube/vomanagement/usermanagement/impl/LiferayUserManager.java b/src/main/java/org/gcube/vomanagement/usermanagement/impl/LiferayUserManager.java
index 1ff43dd..e1b6dd8 100644
--- a/src/main/java/org/gcube/vomanagement/usermanagement/impl/LiferayUserManager.java
+++ b/src/main/java/org/gcube/vomanagement/usermanagement/impl/LiferayUserManager.java
@@ -123,7 +123,7 @@ public class LiferayUserManager implements UserManager {
 	 * {@inheritDoc}
 	 */
 	@Override
-	public GCubeUser createUser(String username, String email, String firstName, String middleName, String lastName, String jobTitle, String backgroundSummary, boolean male)	throws UserManagementSystemException {
+	public GCubeUser createUser(String username, String email, String firstName, String middleName, String lastName, String jobTitle, String backgroundSummary, boolean male, String reminderQuestion, String reminderAnswer)	throws UserManagementSystemException {
 		GCubeUser toReturn = null;
 		try {
 				_log.debug("Trying createuser " + email);
@@ -174,7 +174,11 @@ public class LiferayUserManager implements UserManager {
 				_log.debug("CreateUser " + lastName + " SUCCESS");
 				UserLocalServiceUtil.updateAgreedToTermsOfUse(added.getUserId(), true);
 				UserLocalServiceUtil.updatePasswordReset(added.getUserId(), false);
-				UserLocalServiceUtil.updateReminderQuery(added.getUserId(), "test", "test");
+				if (reminderQuestion == null || reminderQuestion.compareTo("") == 0) 
+					reminderQuestion = "Unknown question";				
+				if (reminderAnswer == null || reminderAnswer.compareTo("") == 0) 
+					reminderAnswer = "Unknown answer";				
+				UserLocalServiceUtil.updateReminderQuery(added.getUserId(), reminderQuestion, reminderAnswer);
 				_log.debug("User " + lastName + " has agreed to ToU");
 				_log.debug("User " + lastName + " updatePasswordReset false");
 				_log.debug("User " + lastName + " updateReminderQuery false");