diff --git a/system_setup/logon_script.sh b/system_setup/logon_script.sh
index d7032ab..40737b9 100755
--- a/system_setup/logon_script.sh
+++ b/system_setup/logon_script.sh
@@ -137,7 +137,6 @@ else
 fi
 
 #Anyway run user scripts if existent
-#elog_add_command "${CLIENT_SOFTWARE_DST}/user_run.sh $1"
 elog_add "Running all software scripts in user- context."
 #1. Run the scripts, that are delivered by the package maintainers
 elog_add "Pre Installed scripts"
@@ -164,7 +163,14 @@ do
     fi
 done
 #2. Run the scripts, that are delivered by the package maintainers
-if [ -d "${CLIENT_SOFTWARE_CUST_DST}" ]; then
+# To run scripts, the tepository path must always be set right (but maybe empty, which is fine)
+if [ "${CLIENT_SOFTWARE_CUST_DST}" != "${SYSCONFIGPATH}/client_software_cust" ]; then
+    echo "Error in config: Required parameter CLIENT_SOFTWARE_CUST_DST is missing or set wrong."
+    echo "Please relog and if the problem reoccures, contact your system admins to correct the Values."
+    read -n 1 -s -r -p "Press any key to continue"
+    echo
+    exit 1
+else
   elog_add "Company delivered scripts in ${CLIENT_SOFTWARE_CUST_DST}"
   for DIR in $(ls -d ${CLIENT_SOFTWARE_CUST_DST}/*/ | sort);     # list directories in the form "/tmp/dirname/"
   do
diff --git a/system_setup/sync_client_software.sh b/system_setup/sync_client_software.sh
index 54c4b63..e2d887b 100755
--- a/system_setup/sync_client_software.sh
+++ b/system_setup/sync_client_software.sh
@@ -142,15 +142,6 @@ if [[ ! -z "${DISTCONFIGPATH_SRC}" ]]; then
     fi
 fi
 
-# To run scripts, the tepository path must always be set right (but maybe empty, which is fine)
-if [ "${CLIENT_SOFTWARE_CUST_DST}" != "${SYSCONFIGPATH}/client_software_cust" ]; then
-    echo "Error in config: Required parameter CLIENT_SOFTWARE_CUST_DST is missing or set wrong."
-    echo "Please relog and if the problem reoccures, contact your system admins to correct the Values."
-    read -n 1 -s -r -p "Press any key to continue"
-    echo ""
-    exit 1
-fi
-
 echo "Running all software scripts in admin- context."
 # Run pre installed scripts in client_software
 echo "Running pre installed scripts first."
@@ -179,11 +170,19 @@ done
 echo "Sucessfully installed pre-defined software."
 echo
 
-# Then, sync all client_software-files
-if [[ -z "${CLIENT_SOFTWARE_CUST_SRC}" ]]; then
+# To run scripts, the repository path must always be set right (but maybe empty, which is fine)
+if [ "${CLIENT_SOFTWARE_CUST_DST}" != "${SYSCONFIGPATH}/client_software_cust" ]; then
+    echo "Error in config: Required parameter CLIENT_SOFTWARE_CUST_DST is missing or set wrong."
+    echo "Please relog and if the problem reoccures, contact your system admins to correct the Values."
+    read -n 1 -s -r -p "Press any key to continue"
+    echo
+    exit 1
+else
+  # Then, sync all client_software-files
+  if [[ -z "${CLIENT_SOFTWARE_CUST_SRC}" ]]; then
     echo "No customer software sync is defined, skipping sync"
     echo "${CLIENT_SOFTWARE_CUST_DST} with ${CLIENT_SOFTWARE_CUST_SRC}"
-else
+  else
     echo "Syncing customer software repository ${CLIENT_SOFTWARE_CUST_DST}"
     # Create Directory if not existent
     mkdir -p ${CLIENT_SOFTWARE_CUST_DST}
@@ -203,20 +202,20 @@ else
         exit 1
     fi
     echo "Sucessfully synced."
-fi
-echo
+  fi
+  echo
 
-#Run customer setup
-if [ ! -z "${CLIENT_SOFTWARE_CUST_DST}" ]; then
-  echo "Running all software scripts in admin- context."
-  for DIR in $(ls -d ${CLIENT_SOFTWARE_CUST_DST}/*/ | sort); do
-    DIR=${DIR%*/}      # remove the trailing "/"
-    if [[ "$1." != "." ]] && [[ "${DIR}" != *"$1"* ]]; then
-      #search for string in dir
-      echo "Skipping ${DIR} while not in search parameter ( $1 )."
-      continue
-    fi
-    if [ -f "${DIR}/install.sh" ]; then
+  #Run customer setup
+  if [ ! -z "${CLIENT_SOFTWARE_CUST_DST}" ]; then
+    echo "Running all software scripts in admin- context."
+    for DIR in $(ls -d ${CLIENT_SOFTWARE_CUST_DST}/*/ | sort); do
+      DIR=${DIR%*/}      # remove the trailing "/"
+      if [[ "$1." != "." ]] && [[ "${DIR}" != *"$1"* ]]; then
+        #search for string in dir
+        echo "Skipping ${DIR} while not in search parameter ( $1 )."
+        continue
+      fi
+      if [ -f "${DIR}/install.sh" ]; then
         echo " ===================="
         echo " >>> Running ${DIR}/install.sh"
         cd ${DIR}
@@ -229,8 +228,9 @@ if [ ! -z "${CLIENT_SOFTWARE_CUST_DST}" ]; then
           exit 1
         fi
         echo " ===================="
-    fi
-  done
+      fi
+    done
+  fi
 fi
 
 #Last, remove unused Flatpak- Runtimes and unused Data