diff --git a/src/main/java/org/gcube/portal/social/networking/ws/methods/v2/Notifications.java b/src/main/java/org/gcube/portal/social/networking/ws/methods/v2/Notifications.java
index 5de9222..1b614f3 100644
--- a/src/main/java/org/gcube/portal/social/networking/ws/methods/v2/Notifications.java
+++ b/src/main/java/org/gcube/portal/social/networking/ws/methods/v2/Notifications.java
@@ -362,7 +362,7 @@ public class Notifications {
 			GCubeUser jarvis = UserManagerWSBuilder.getInstance().getUserManager().getUserByEmail(LiferayJSONWsCredentials.getSingleton().getUser());
 			SecurityTokenProvider.instance.set(LiferayJSONWsCredentials.getSingleton().getNotifierUserToken());
 			username = jarvis.getUsername();
-			fullName = "Catalogue" + "("+caller.getClient().getId()+")"; // the actual name of the IAM Client
+			fullName = caller.getClient().getId(); // the actual name of the IAM Client
 			senderUser = um.getUserByUsername(username);	
 			user = new SocialNetworkingUser(senderUser.getUsername(), senderUser.getEmail(), fullName, senderUser.getUserAvatarURL());
 		}else{
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 ecbb905..8c2e120 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
@@ -48,8 +48,8 @@ public class TokensUtils {
 	 * @return a boolean value
 	 */
 	public static boolean isUserToken(Caller caller){
-
-		return caller.getClient().getType().equals(ClientType.USER);
+		String username = caller.getClient().getId();
+		return !username.startsWith("service-account-");
 
 	}