diff --git a/src/main/java/org/gcube/portal/social/networking/ws/utils/TokensUtils.java b/src/main/java/org/gcube/portal/social/networking/ws/utils/TokensUtils.java
index 8c2e120..9c5fc8f 100644
--- a/src/main/java/org/gcube/portal/social/networking/ws/utils/TokensUtils.java
+++ b/src/main/java/org/gcube/portal/social/networking/ws/utils/TokensUtils.java
@@ -28,7 +28,10 @@ public class TokensUtils {
 	 * @return a boolean value
 	 */
 	public static boolean isApplicationToken(Caller caller){
-
+		String username = caller.getClient().getId();
+		if (username.startsWith("service-account-")) {
+			return true;
+		}
 		return caller.getClient().getType().equals(ClientType.EXTERNALSERVICE);
 
 	}
@@ -49,7 +52,10 @@ public class TokensUtils {
 	 */
 	public static boolean isUserToken(Caller caller){
 		String username = caller.getClient().getId();
-		return !username.startsWith("service-account-");
+		if (username.startsWith("service-account-")) {
+			return false;
+		}
+		return caller.getClient().getType().equals(ClientType.USER);
 
 	}
 
@@ -58,9 +64,7 @@ public class TokensUtils {
 	 * @return a boolean value
 	 */
 	public static boolean isUserTokenDefault(Caller caller){
-
-		return caller.getClient().getType().equals(ClientType.USER);
-
+		return isUserToken(caller);
 	}
 
 	/**