diff --git a/scripts/rest-clients/get-xml-schema.sh b/scripts/rest-clients/get-xml-schema.sh
index cb8069508..1a2a7f5fc 100755
--- a/scripts/rest-clients/get-xml-schema.sh
+++ b/scripts/rest-clients/get-xml-schema.sh
@@ -7,18 +7,19 @@ read loginName
 printf "Password: "
 read password
 
-baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL
-certificate=$DEVELOPMENT_CERTIFICATE
-
-for i in "$@"
-do
-    if [ "$i" = "--prod" ]; then
-        baseServiceURL=$PRODUCTION_BASE_SERVICE_URL
-        certificate=$PRODUCTION_CERTIFICATE
-    else
-       service=$i
-    fi
-done
+if [ "$1" = "--prod" ]; then
+    baseServiceURL=$PRODUCTION_BASE_SERVICE_URL
+    certificate=$PRODUCTION_CERTIFICATE
+    service=$2
+elif [ "$1" = "--dev" ]; then
+    baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL
+    certificate=$DEVELOPMENT_CERTIFICATE
+    service=$2
+else
+    baseServiceURL=$DEMO_BASE_SERVICE_URL
+    certificate=$DEMO_CERTIFICATE
+    service=$1
+fi
 
 if [ "$service" = "" ]; then
     printf "Missing service path\n" 1>&2