diff --git a/src/main/java/org/gcube/portlets/admin/authportletmanager/server/AuthServiceImpl.java b/src/main/java/org/gcube/portlets/admin/authportletmanager/server/AuthServiceImpl.java
index cf4d779..16cdca6 100644
--- a/src/main/java/org/gcube/portlets/admin/authportletmanager/server/AuthServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/admin/authportletmanager/server/AuthServiceImpl.java
@@ -426,11 +426,11 @@ implements AuthManagerService {
 			SecurityTokenProvider.instance.set(token);
 			for (PolicyAuth policy: policiesAuth){
 				
-				String serviceName = policy.getService().getServiceName().toLowerCase().equals("all")?null:policy.getService().getServiceName();
-				String serviceClass = policy.getService().getServiceClass().toLowerCase().equals("all")?null:policy.getService().getServiceClass();
-				String serviceId = 	policy.getService().getServiceId().toLowerCase().equals("all")?null:policy.getService().getServiceId();	
+				String polServiceName = policy.getService().getServiceName().equalsIgnoreCase("all")?null:policy.getService().getServiceName();
+				String polServiceClass = policy.getService().getServiceClass().equalsIgnoreCase("all")?null:policy.getService().getServiceClass();
+				String polServiceId = 	policy.getService().getServiceId().equalsIgnoreCase("all")?null:policy.getService().getServiceId();	
 								
-				ServiceAccess service=new ServiceAccess(serviceName, serviceClass, serviceId);
+				ServiceAccess service=new ServiceAccess(polServiceName, polServiceClass, polServiceId);
 				
 				
 				Action access =Action.valueOf(policy.getAccessString());
@@ -520,7 +520,11 @@ implements AuthManagerService {
 			authorizationService().removePolicies(policy.getIdpolicy());
 			//add a new policy
 			List<Policy> policies = new ArrayList<Policy>();
-			ServiceAccess service=new ServiceAccess(policy.getService().getServiceName(), policy.getService().getServiceClass(), policy.getService().getServiceId());
+			String polServiceName = policy.getService().getServiceName().equalsIgnoreCase("all")?null:policy.getService().getServiceName();
+			String polServiceClass = policy.getService().getServiceClass().equalsIgnoreCase("all")?null:policy.getService().getServiceClass();
+			String polServiceId = 	policy.getService().getServiceId().equalsIgnoreCase("all")?null:policy.getService().getServiceId();	
+							
+			ServiceAccess service=new ServiceAccess(polServiceName, polServiceClass, polServiceId);
 			logger.info("updatePolicy -policy.getCallerAsString()"+policy.getCallerAsString());
 			Action access =Action.valueOf(policy.getAccessString());