diff --git a/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/ACIdentityManager.java b/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/ACIdentityManager.java
index a56987d7f159b3224e2ffd02d8aee6dba02de612..c32b2d5e585f10f07de8ab8c0e9432b97d7ace9b 100644
--- a/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/ACIdentityManager.java
+++ b/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/ACIdentityManager.java
@@ -15,6 +15,7 @@ import java.util.UUID;
 import javax.security.auth.Subject;
 import javax.security.auth.x500.X500Principal;
 
+import ca.nrc.cadc.reg.Standards;
 import org.apache.log4j.Logger;
 
 import ca.nrc.cadc.ac.User;
@@ -236,7 +237,8 @@ public class ACIdentityManager implements IdentityManager
             RegistryClient regClient = new RegistryClient();
             LocalAuthority localAuth = new LocalAuthority();
             URI serviceURI = localAuth.getServiceURI("gms");
-            URL availURL = regClient.getServiceURL(serviceURI, "http", "/availability");
+            URL serviceURL = regClient.getServiceURL(serviceURI, Standards.GMS_01_URI, AuthMethod.ANON);
+            URL availURL = new URL(serviceURL.toExternalForm() + "/availability");
             return new CheckWebService(availURL.toExternalForm());
         }
         catch (MalformedURLException e)
diff --git a/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/AuthenticatorImpl.java b/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/AuthenticatorImpl.java
index af6b5a155831905bd62b05cdb129cf5c67543515..74287adc817f9754e11a51b4b349ccf973e59cc3 100644
--- a/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/AuthenticatorImpl.java
+++ b/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/AuthenticatorImpl.java
@@ -7,6 +7,7 @@ import java.net.URL;
 import javax.security.auth.Subject;
 import javax.security.auth.x500.X500Principal;
 
+import ca.nrc.cadc.reg.Standards;
 import org.apache.log4j.Logger;
 
 import ca.nrc.cadc.profiler.Profiler;
@@ -74,7 +75,8 @@ public class AuthenticatorImpl implements Authenticator
             RegistryClient regClient = new RegistryClient();
             LocalAuthority localAuth = new LocalAuthority();
             URI serviceURI = localAuth.getServiceURI("gms");
-            URL availURL = regClient.getServiceURL(serviceURI, "http", "/availability");
+            URL serviceURL = regClient.getServiceURL(serviceURI, Standards.GMS_01_URI, AuthMethod.ANON);
+            URL availURL = new URL(serviceURL.toExternalForm() + "/availability");
             return new CheckWebService(availURL.toExternalForm());
         }
         catch (MalformedURLException e)