diff --git a/client_software/0010_kwallet/qbus_wallet_exec.sh b/client_software/0010_kwallet/qbus_wallet_exec.sh
index 5996971..adf8c01 100755
--- a/client_software/0010_kwallet/qbus_wallet_exec.sh
+++ b/client_software/0010_kwallet/qbus_wallet_exec.sh
@@ -31,13 +31,3 @@ fi
 #Now, run the command
 ${QB_CMD} "$QB_SERVICE" "$QB_PATH" $@
 exit $?
-
-#Check if kwalletd is enabled
-${QB_CMD} "$QB_SERVICE" "$QB_PATH" reconfigure
-QB_RESULT=$( ${QB_CMD} "$QB_SERVICE" "$QB_PATH" isEnabled 2>/dev/null || true)
-if [[ "$QB_RESULT" != "true" ]]; then
-  echo "Error checking if kWallet service is activated. Cannot continue. Return of Check was:"
-  echo "$QB_RESULT"
-  exit 1
-fi
-
diff --git a/client_software/0010_kwallet/user_run.sh b/client_software/0010_kwallet/user_run.sh
index e8444a9..94622ad 100755
--- a/client_software/0010_kwallet/user_run.sh
+++ b/client_software/0010_kwallet/user_run.sh
@@ -12,9 +12,9 @@ sleep 1
 #Check if kwalletd is enabled now
 QB_RESULT=$( $(dirname $0)/qbus_wallet_exec.sh isEnabled 2>/dev/null || true )
 if [[ "$QB_RESULT" != "true" ]]; then
-  echo "Error checking if kWallet service is activated. Cannot continue. Return of Check was:"
+  echo "Error checking if kWallet service is activated. Please Check yourself what is wrong. Return of Check was:"
   echo "$QB_RESULT"
-  exit 1
+  exit 0
 fi
 
 #It should be possible to open the wallet without having to enter the password now.