diff --git a/src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java b/src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java
index 34bba00..8c5382a 100644
--- a/src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java
+++ b/src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java
@@ -80,7 +80,7 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy {
 			token =  result.toString();
 		}
 
-		return token;
+		return Utils.addInfrastructureHashToToken(token, infrastructureHash);
 	}
 	
 	@Override
@@ -115,7 +115,7 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy {
 			token =  result.toString();
 		}
 
-		return token;
+		return Utils.addInfrastructureHashToToken(token, infrastructureHash);
 	}
 		
 	
@@ -147,7 +147,7 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy {
 			token =  result.toString();
 		}
 
-		return token;
+		return Utils.addInfrastructureHashToToken(token, infrastructureHash);
 	}
 	
 	@Override
@@ -184,8 +184,9 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy {
 		
 		String methodPath = "/token/node"; 
 				
+		int infrastructureHash = Utils.getInfrastructureHashfromContext(context);
 		StringBuilder callUrl = 
-				new StringBuilder(getInternalEnpoint(Utils.getInfrastructureHashfromContext(context))).append(methodPath).append("?")
+				new StringBuilder(getInternalEnpoint(infrastructureHash)).append(methodPath).append("?")
 				.append(CONTEXT_PARAM).append("=").append(context);
 					
 		URL url = new URL(callUrl.toString());
@@ -210,7 +211,7 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy {
 			token =  result.toString();
 		}
 
-		return token;
+		return Utils.addInfrastructureHashToToken(token, infrastructureHash);
 	}
 	
 	@Override
@@ -293,7 +294,7 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy {
 		HttpURLConnection connection = (HttpURLConnection)url.openConnection();
 		if (includeTokenInHeader){
 			if (SecurityTokenProvider.instance.get()==null) throw new RuntimeException("null token passed");
-			connection.setRequestProperty(Constants.TOKEN_HEADER_ENTRY,SecurityTokenProvider.instance.get());
+			connection.setRequestProperty(Constants.TOKEN_HEADER_ENTRY,Utils.getRealToken(SecurityTokenProvider.instance.get()));
 		}
 		connection.setRequestMethod(method);
 		return connection;
diff --git a/src/main/java/org/gcube/common/authorization/client/proxy/Utils.java b/src/main/java/org/gcube/common/authorization/client/proxy/Utils.java
index feca2ac..47184f9 100644
--- a/src/main/java/org/gcube/common/authorization/client/proxy/Utils.java
+++ b/src/main/java/org/gcube/common/authorization/client/proxy/Utils.java
@@ -35,7 +35,7 @@ public class Utils {
 	}
 
 
-	protected static String AddInfrastructureHashToToken(String token, int infrastructureHash) {
+	protected static String addInfrastructureHashToToken(String token, int infrastructureHash) {
 		return String.format("%s-%d", token, infrastructureHash);
 	}
 
diff --git a/src/test/java/org/gcube/common/authorizationservice/cl/CallTest.java b/src/test/java/org/gcube/common/authorizationservice/cl/CallTest.java
index 47e285d..413eff3 100644
--- a/src/test/java/org/gcube/common/authorizationservice/cl/CallTest.java
+++ b/src/test/java/org/gcube/common/authorizationservice/cl/CallTest.java
@@ -20,12 +20,12 @@ public class CallTest {
 
 	@Test
 	public void resolveNodeToken() throws Exception{
-		System.out.println(resolveToken("c3c52f5b-ea65-4364-8357-be930763fdad-98187548")); //81caac0f-8a0d-4923-9312-7ff0eb3f2d5e|98187548"));
+		System.out.println(resolveToken("c3c52f5b-ea65-4364-8357-be930763fdad")); //81caac0f-8a0d-4923-9312-7ff0eb3f2d5e|98187548"));
 	}
 	
 	@Test
 	public void requestNodeToken()  throws Exception {
-		String token = authorizationService().requestActivation(new ContainerInfo("dataminer1-devnext.d4science.org",80), "/gcube/devNext/NextNext");
+		String token = authorizationService().requestActivation(new ContainerInfo("ckan-d-d4s.d4science.org",80), "/gcube/devNext/NextNext");
 		System.out.println(token);
 	}