diff --git a/script/start.sh b/script/start.sh
index 2ada71b..eb144ec 100644
--- a/script/start.sh
+++ b/script/start.sh
@@ -339,9 +339,13 @@ if [[ "$ACTION" == "setup" ]]; then
         [[ -n "$COMPANY_NAME" ]] && ENV_ARGS="$ENV_ARGS --company $(printf '%q' "$COMPANY_NAME")"
         [[ -n "$DOCKER_USER" ]] && ENV_ARGS="$ENV_ARGS --docker-user $(printf '%q' "$DOCKER_USER")"
 
+        # Build environment variables to pass to remote script
+        ENV_VARS=""
+        [[ -n "$SYSADMIN_REGISTRATION_TOKEN" ]] && ENV_VARS="SYSADMIN_REGISTRATION_TOKEN=$(printf '%q' "$SYSADMIN_REGISTRATION_TOKEN")"
+
         if [[ -n "$ENV_ARGS" ]]; then
-            eval "$SSH_CMD \"bash ${REMOTE_BASE}/scripts/env_setup.sh $ENV_ARGS && touch ${REMOTE_BASE}/.env_installed\"" || \
-            eval "$SSH_CMD \"bash /tmp/env_setup.sh $ENV_ARGS && touch /tmp/.env_installed\""
+            eval "$SSH_CMD \"$ENV_VARS bash ${REMOTE_BASE}/scripts/env_setup.sh $ENV_ARGS && touch ${REMOTE_BASE}/.env_installed\"" || \
+            eval "$SSH_CMD \"$ENV_VARS bash /tmp/env_setup.sh $ENV_ARGS && touch /tmp/.env_installed\""
         else
             echo "  WARNING: No customer/domain/company provided. Skipping env_setup.sh"
             echo "  Run manually: env_setup.sh --customer X --domain Y --company Z"