diff --git a/samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/setup-controller-new.sh b/samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/setup-controller-new.sh
index 6435ad03..5ec006a4 100644
--- a/samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/setup-controller-new.sh
+++ b/samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/setup-controller-new.sh
@@ -1,26 +1,5 @@
 #!/bin/bash
 
-# Get controller username and password as input. It is used as default for the controller.
-#
-if [ -z "$AZDATA_USERNAME" ]
-then
-    read -p "Create Username for Azure Arc Data Controller: " username
-    echo
-    export AZDATA_USERNAME=$username
-fi
-if [ -z "$AZDATA_PASSWORD" ]
-then
-    while true; do
-        read -s -p "Create Password for Azure Arc Data Controller: " password
-        echo
-        read -s -p "Confirm your Password: " password2
-        echo
-        [ "$password" = "$password2" ] && break
-        echo "Password mismatch. Please try again."
-    done
-    export AZDATA_PASSWORD=$password
-fi
-
 # Prompt for private preview repository username and password provided by Microsoft
 #
 if [ -z "$DOCKER_USERNAME" ]
@@ -67,6 +46,27 @@ then
     export ARC_DC_REGION=$dc_region
 fi
 
+# Get controller username and password as input. It is used as default for the controller.
+#
+if [ -z "$AZDATA_USERNAME" ]
+then
+    read -p "Create Username for Azure Arc Data Controller: " username
+    echo
+    export AZDATA_USERNAME=$username
+fi
+if [ -z "$AZDATA_PASSWORD" ]
+then
+    while true; do
+        read -s -p "Create Password for Azure Arc Data Controller: " password
+        echo
+        read -s -p "Confirm your Password: " password2
+        echo
+        [ "$password" = "$password2" ] && break
+        echo "Password mismatch. Please try again."
+    done
+    export AZDATA_PASSWORD=$password
+fi
+
 set -Eeuo pipefail
 
 # This is a script to create single-node Kubernetes cluster and deploy Azure Arc Data Controller on it.