diff --git a/README.md b/README.md
index 5f6c427..0f485ee 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ After the prompt return, you should be able to access your device through the co
 - **NOTE:** You can also run the script in **non-interactive** mode, doing:
 
 ```sh
-wanpadctl <DOMAIN HERE> <TOKEN HERE>
+wanpadctl init <DOMAIN HERE> <TOKEN HERE>
 ```
 
 ## Contributions
diff --git a/usr/local/etc/wanpad/wanpad.conf.sample b/usr/local/etc/wanpad/wanpad.conf.sample
index 8726faa..f2b76f9 100644
--- a/usr/local/etc/wanpad/wanpad.conf.sample
+++ b/usr/local/etc/wanpad/wanpad.conf.sample
@@ -23,4 +23,4 @@ SSL=true
 
 # OpenVPN Client
 # The ".ovpn" file must be located under /usr/local/etc/wanpad/ directory.
-OOB_CONFIG_FILE=client.ovpn
\ No newline at end of file
+OOB_CONFIG_FILE=client.ovpn
diff --git a/usr/local/share/wanpad/init.sh b/usr/local/share/wanpad/init.sh
index ecd86d0..38a5c61 100755
--- a/usr/local/share/wanpad/init.sh
+++ b/usr/local/share/wanpad/init.sh
@@ -28,7 +28,7 @@ case "$NA" in
 		ztp_dialogue
 		;;
 	2)
-		DOMAIN=$1
+		CONTROLLER_DOMAIN=$1
 		TOKEN=$2
 		;;
 	*)
diff --git a/usr/local/share/wanpad/lib/install-lib.sh b/usr/local/share/wanpad/lib/install-lib.sh
index fbafbf2..fd48e0a 100755
--- a/usr/local/share/wanpad/lib/install-lib.sh
+++ b/usr/local/share/wanpad/lib/install-lib.sh
@@ -34,7 +34,12 @@ enable_wanpad_systemd_services()
 
 start_wanpad_services()
 {
-	service wanpad-* start || true
+	if [ "$OSKERNEL" = "Linux" ]
+	then 
+		systemctl start wanpad-*.service --all || true
+	else	
+		service wanpad-* start || true
+	fi	
 }
 
 enable_ipv4_forward()
diff --git a/usr/local/share/wanpad/lib/ztp-lib.sh b/usr/local/share/wanpad/lib/ztp-lib.sh
index 9a6c62c..010a032 100755
--- a/usr/local/share/wanpad/lib/ztp-lib.sh
+++ b/usr/local/share/wanpad/lib/ztp-lib.sh
@@ -64,6 +64,6 @@ run_ztp_py()
 	set -a
 	. /usr/local/etc/wanpad/wanpad.conf
 	set +a
-	export CONTROLLER_TOKEN_VALIDATION_URL="$(get_controller_url /wanpad/api/v1/auth/validate_token/)"
+	export CONTROLLER_TOKEN_URL="$(get_controller_url /wanpad/api/v1/devices/plug_play/)"
 	python3 /usr/local/share/wanpad/ztp/pnp-client.py
-}
\ No newline at end of file
+}
diff --git a/usr/local/share/wanpad/ztp/pnp-client.py b/usr/local/share/wanpad/ztp/pnp-client.py
index a184a69..64949bf 100755
--- a/usr/local/share/wanpad/ztp/pnp-client.py
+++ b/usr/local/share/wanpad/ztp/pnp-client.py
@@ -45,7 +45,7 @@ def client_program():
                 "hostname": socket.gethostname(),
                 "token": os.environ['TOKEN'],
                 "dsf": dsf}
-        url = os.environ['CONTROLLER_TOKEN_VALIDATION_URL']
+        url = os.environ['CONTROLLER_TOKEN_URL']
         request_to_url = requests.post(url, verify=False, data=data, timeout=6)
         if request_to_url.status_code == 400:
             print(request_to_url.text)