diff --git a/client_software/0020_nextcloud_desktopclient/user_run.sh b/client_software/0020_nextcloud_desktopclient/user_run.sh
index ffbf620..37f16c6 100755
--- a/client_software/0020_nextcloud_desktopclient/user_run.sh
+++ b/client_software/0020_nextcloud_desktopclient/user_run.sh
@@ -21,15 +21,12 @@ fi
 if [ -f "$SUDO_HOME/.config/autostart/com.nextcloud.desktopclient.nextcloud.desktop" ]; then
   echo "Remove Autostart Nextcloud"
   rm $SUDO_HOME/.config/autostart/com.nextcloud.desktopclient.nextcloud.desktop
-  #Stopping Nextcloud
-  su -c "$BASECMD --quit 1>/dev/null 2>/dev/null" $SUDO_USER
-  sleep 5
 fi
 
 NC_PID=$( pgrep -u $USER nextcloud )
 if [[ ! -z ${NC_PID} ]]; then
     echo "Stopping Nextcloud with PID ${NC_PID}"
-#    $BASECMD --quit 1>/dev/null 2>/dev/null && sleep 5
+#    $BASECMD --quit 1>/dev/null 2>/dev/null && sleep 2
     kill ${NC_PID}
     if [[ $? -ne 0 ]]; then
       echo "Service could not be stopped, please check why."
@@ -111,6 +108,7 @@ done
 #    exit 1
 #fi
 # Now start Nextcloud
-nohup ${BASECMD} 1>/dev/null 2>/dev/null &
+echo "Starting Nextcloud Client in Background"
+nohup ${BASECMD} --background 1>/dev/null 2>/dev/null &
 echo "Done Setup of Nextcloud."
 exit 0