diff --git a/common/openstack/src/main/java/org/jclouds/openstack/functions/ParseAuthenticationResponseFromHeaders.java b/common/openstack/src/main/java/org/jclouds/openstack/functions/ParseAuthenticationResponseFromHeaders.java
index 249a6165e4..8061c41553 100644
--- a/common/openstack/src/main/java/org/jclouds/openstack/functions/ParseAuthenticationResponseFromHeaders.java
+++ b/common/openstack/src/main/java/org/jclouds/openstack/functions/ParseAuthenticationResponseFromHeaders.java
@@ -89,7 +89,11 @@ public class ParseAuthenticationResponseFromHeaders implements Function<HttpResp
 
    @Override
    public ParseAuthenticationResponseFromHeaders setContext(HttpRequest request) {
-      return setHostToReplace(request.getEndpoint().getHost());
+      String host = request.getEndpoint().getHost();
+      if (request.getEndpoint().getPort() != -1) {
+         host += ":" + request.getEndpoint().getPort();
+      }
+      return setHostToReplace(host);
    }
 
    @VisibleForTesting