diff --git a/client_software/0010_kwallet/install.sh b/client_software/0010_kwallet/install.sh
index 3db5c89..6db28ff 100755
--- a/client_software/0010_kwallet/install.sh
+++ b/client_software/0010_kwallet/install.sh
@@ -52,7 +52,8 @@ if [[ ! -z ${WALLET_PID} ]]; then
       exit 1
     fi
   fi
-  kill ${WALLET_PID} && sleep 0.5 && echo "Service kwalletd6 (${WALLET_PID}) was stopped."
+  echo "Stopping kwalletd6 with PID ${WALLET_PID}"
+  kill ${WALLET_PID} && sleep 0.5
   if [[ $? -ne 0 ]]; then
     echo "Kwallet Service could not be stopped, please check why."
     exit 1
@@ -112,5 +113,5 @@ if [[ $? -ne 0 ]]; then
   echo "Error bind mounting secure Files to Wallet. Please check what went wrong."
   exit 1
 fi
-
+echo "Done setting up kwallet from secure user folder."
 exit 0
diff --git a/client_software/0010_kwallet/user_run.sh b/client_software/0010_kwallet/user_run.sh
index bee7964..3d84113 100755
--- a/client_software/0010_kwallet/user_run.sh
+++ b/client_software/0010_kwallet/user_run.sh
@@ -15,7 +15,13 @@ nohup kwalletd6 >/dev/null 2>&1 &
 sleep 1
 
 #Check if kwalletd is enabled now
-QB_RESULT=$( $(dirname $0)/qbus_wallet_exec.sh isEnabled 2>/dev/null || true )
+for i in $(seq 1 4); do
+  QB_RESULT=$( $(dirname $0)/qbus_wallet_exec.sh isEnabled )
+  if [[ "$QB_RESULT" == "true" ]]; then
+    break
+  fi
+  sleep 2
+done
 if [[ "$QB_RESULT" != "true" ]]; then
   echo "Error checking if kWallet service is activated. Please Check yourself what is wrong. Return of Check was:"
   echo "$QB_RESULT"
@@ -30,6 +36,6 @@ if [[ $? -ne 0 ]]; then
   echo "Some Error opening Wallet ${WALLETNAME}. Please check."
   exit 1
 fi
-echo "Sucessfully opened Wallet ${WALLETNAME} with ID ${QB_RESULT}."
+echo "Sucessfully opened Wallet ${WALLETNAME} with ID ${QB_RESULT}. All is fine."
 
 exit 0