diff --git a/src/main/java/org/gcube/portlets/user/joinvre/server/JoinServiceImpl.java b/src/main/java/org/gcube/portlets/user/joinvre/server/JoinServiceImpl.java
index dfefb13..e019d02 100644
--- a/src/main/java/org/gcube/portlets/user/joinvre/server/JoinServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/joinvre/server/JoinServiceImpl.java
@@ -107,7 +107,7 @@ public class JoinServiceImpl extends RemoteServiceServlet implements JoinService
 	 */
 	@Override
 	public String getTermsOfUse(long siteId) {
-		
+
 		TermsOfUse tou = new TermsOfUseImpl();
 		try {
 			long groupId = new LiferayGroupManager().getGroup(siteId).getGroupId();
@@ -377,6 +377,10 @@ public class JoinServiceImpl extends RemoteServiceServlet implements JoinService
 			}			
 			_log.debug("Request does not exist, addMembershipRequest for user " + username);
 			LoginServiceUtil.addMembershipRequest(username, scope, optionalMessage, getThreadLocalRequest());
+			if (getTermsOfUse(groupId) != null) {
+				new TermsOfUseImpl().hasAcceptedToU(username, groupId);
+				_log.info(username + "has requested and acceptedToU OK for " + scope);
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -417,8 +421,10 @@ public class JoinServiceImpl extends RemoteServiceServlet implements JoinService
 				LoginServiceUtil.notifyUserSelfRegistration(currUser.getUsername(), scope, getThreadLocalRequest());
 				_log.info("notifyUserSelfRegistration sent");
 			}
-			new TermsOfUseImpl().hasAcceptedToU(currUser.getUsername(), groupId);
-			_log.info("hasAcceptedToU OK for " + currUser.getUsername());
+			if (getTermsOfUse(groupId) != null) {
+				new TermsOfUseImpl().hasAcceptedToU(currUser.getUsername(), groupId);
+				_log.info("hasAcceptedToU OK for " + currUser.getUsername());
+			}
 		} 
 		catch (Exception e) {
 			e.printStackTrace();
@@ -456,7 +462,7 @@ public class JoinServiceImpl extends RemoteServiceServlet implements JoinService
 		_log.debug("checking if invite exists for " + email + " on " +infraScope);
 		return store.isExistingInvite(infraScope, email);
 	}
-	
+
 
 
 	/**