diff --git a/mxstartup-classic.service b/mxstartup-classic.service
index b2ba5ca..827854d 100644
--- a/mxstartup-classic.service
+++ b/mxstartup-classic.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Mariux mxstartup classic
-After=mxstartup-mxvip.service mxmount.service
+After=mxstartup-mxvip.service mxmount.service nis.service
 Requires=mxstartup-mxvip.service mxmount.service
 
 [Service]
diff --git a/mxstartupctl b/mxstartupctl
index 0b52f0a..8dbaf94 100755
--- a/mxstartupctl
+++ b/mxstartupctl
@@ -2,13 +2,13 @@
 
 remoteuser=molgen
 
-while ! id ${remoteuser} >/dev/null 2>&1 ; do
-    echo >&2 "WARNING: Waiting for NIS (failed to resolve remote user ${remoteuser})"
-    sleep 1
-done
 
 case "${1}" in
     start)
+        while ! id ${remoteuser} >/dev/null 2>&1 ; do
+            echo >&2 "WARNING: Waiting for NIS (failed to resolve remote user ${remoteuser})"
+            sleep 1
+        done
         mxvipctl     start $2
         mxservicectl start $2
         ;;