diff --git a/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java b/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java
index ec22265..633b6c0 100644
--- a/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java
@@ -82,6 +82,7 @@ public class ShareUpdateServiceImpl extends RemoteServiceServlet implements	Shar
 	private static final String STORAGE_OWNER = "gCubeSocialFramework";
 	public static final String UPLOAD_DIR = "/social-framework-uploads";
 	private static final String NEWS_FEED_PORTLET_CLASSNAME = "org.gcube.portlets.user.newsfeed.server.NewsServiceImpl";
+	private final static String ATTR_TO_CHECK = "Postnotificationviaemail";
 	/**
 	 * 
 	 */
@@ -276,7 +277,7 @@ public class ShareUpdateServiceImpl extends RemoteServiceServlet implements	Shar
 			if (isWithinPortal() && username.compareTo(TEST_USER) != 0) {
 				long companyId = OrganizationsUtil.getCompany().getCompanyId();
 				com.liferay.portal.model.UserModel user = UserLocalServiceUtil.getUserByScreenName(companyId, username);
-				Organization currOrg =  OrganizationLocalServiceUtil.getOrganization(session.getGroupId());
+				
 				thumbnailURL = "/image/user_male_portrait?img_id="+user.getPortraitId();
 				fullName = user.getFirstName() + " " + user.getLastName();
 				email = user.getEmailAddress();
@@ -287,7 +288,7 @@ public class ShareUpdateServiceImpl extends RemoteServiceServlet implements	Shar
 
 				UserInfo userInfo = new UserInfo(username, fullName, thumbnailURL, user.getEmailAddress(), accountURL, true, isAdmin(), vreNames);
 				
-				UserSettings toReturn = new UserSettings(userInfo, 0, session.getScopeName(), isInfrastructureScope(), isNotificationViaEmailEnabled(username, currOrg));
+				UserSettings toReturn = new UserSettings(userInfo, 0, session.getScopeName(), isInfrastructureScope(), isNotificationViaEmailEnabled(session));
 				return toReturn;
 			}
 			else {
@@ -306,9 +307,9 @@ public class ShareUpdateServiceImpl extends RemoteServiceServlet implements	Shar
 		return new UserSettings();
 	}
 	
-	private boolean isNotificationViaEmailEnabled(String username, Organization currOrg) {
-		final String ATTR_TO_CHECK = "PostNotificationViaEmail";
-		return OrganizationManagerImpl.get().readOrganizationCustomAttribute(username, currOrg, ATTR_TO_CHECK);
+	private boolean isNotificationViaEmailEnabled(ASLSession session) throws PortalException, SystemException {
+		Organization currOrg =  OrganizationLocalServiceUtil.getOrganization(session.getGroupId());
+		return OrganizationManagerImpl.getInstance(session).readOrganizationCustomAttribute(session.getUsername(), currOrg, ATTR_TO_CHECK);
 	}
 	
 	/**