diff --git a/src/main/java/microsoft/exchange/webservices/data/autodiscover/AutodiscoverService.java b/src/main/java/microsoft/exchange/webservices/data/autodiscover/AutodiscoverService.java
index 147a61c7f..b5ba37ed9 100644
--- a/src/main/java/microsoft/exchange/webservices/data/autodiscover/AutodiscoverService.java
+++ b/src/main/java/microsoft/exchange/webservices/data/autodiscover/AutodiscoverService.java
@@ -549,6 +549,7 @@ TSettings internalGetLegacyUserSettings(
     int scpUrlCount;
     OutParam<Integer> outParamInt = new OutParam<Integer>();
     List<URI> urls = this.getAutodiscoverServiceUrls(domainName, outParamInt);
+    List<URI> origUrls = new ArrayList<URI>(urls);
     scpUrlCount = outParamInt.getParam();
     if (urls.size() == 0) {
       throw new ServiceValidationException(
@@ -570,6 +571,9 @@ TSettings internalGetLegacyUserSettings(
 
     do {
       URI autodiscoverUrl = urls.get(currentUrlIndex);
+      if (origUrls.contains(autodiscoverUrl)) {
+        currentHop.setParam(1);
+      }
       boolean isScpUrl = currentUrlIndex < scpUrlCount;
 
       try {
@@ -601,7 +605,7 @@ TSettings internalGetLegacyUserSettings(
                               settings
                                   .getRedirectTarget()));
 
-              urls.add(currentUrlIndex, new URI(
+              urls.set(currentUrlIndex, new URI(
                   settings.getRedirectTarget()));
 
               break;