diff --git a/client_software/0010_kwallet/install.sh b/client_software/0010_kwallet/install.sh
index 2fc3153..78395ae 100755
--- a/client_software/0010_kwallet/install.sh
+++ b/client_software/0010_kwallet/install.sh
@@ -36,13 +36,16 @@ WALLETPATH="${DECRYPTEDDATADIR}/kwallet"
 WALLETPATH_CFG="$SUDO_HOME/.local/share/kwalletd"
 
 # Stop the daemon anyway if running
-WALLET_PID=$( pgrep -u $USER kwalletd6 )
+WALLET_PID=$( pgrep -u $SUDO_USER kwalletd6 )
 if [[ ! -z ${WALLET_PID} ]]; then
-  kill ${WALLET_PID} && sleep 0.5
+  kill ${WALLET_PID} && sleep 0.5 && echo "Service kwalletd6 was stopped."
   if [[ $? -ne 0 ]]; then
     echo "Kwallet Service could not be stopped, please check why."
     exit 1
   fi
+else
+  echo "Service kwalletd6 not found to be stopped. Please check why."
+  exit 1
 fi
 
 #Setup encrypted path if not existing already
@@ -56,12 +59,21 @@ if [ ! -f "${WALLETPATH}/${WALLETNAME}.kwl" ]; then
     echo "Error: Copy of files for Wallet ${WALLETNAME} failed."
     exit 1
   fi
+else
+  echo "Will use existing encrypted Wallet in ${WALLETPATH}/${WALLETNAME}.kwl"
 fi
 chown $SUDO_USER:$SUDO_USER ${WALLETPATH} -R
 chmod u=rwX,og-rwx ${WALLETPATH} -R
 
 #Unmount to have free vision to Directory
-umount ${WALLETPATH_CFG} >/dev/null 2>&1
+if grep -q ""${WALLETPATH_CFG}"" "/etc/mtab"; then
+  echo "Umount of Wallet-Config ${WALLETPATH_CFG}"
+  umount ${WALLETPATH_CFG}
+  if [[ $? -ne 0 ]]; then
+    echo "Error in unmount. Please check."
+    exit 1
+  fi
+fi
 
 #With every new start of KDE the Files will be recreated in ${WALLETPATH_CFG} containing no passwords but enrcypted with current user Password.
 #We cannot use this wallet, so drop it
diff --git a/client_software/0010_kwallet/kdewallet.kwl b/client_software/0010_kwallet/kdewallet.kwl
index 955ea1a..3fcd778 100644
Binary files a/client_software/0010_kwallet/kdewallet.kwl and b/client_software/0010_kwallet/kdewallet.kwl differ
diff --git a/client_software/0010_kwallet/kdewallet.salt b/client_software/0010_kwallet/kdewallet.salt
index 05c23d7..074bbd6 100644
--- a/client_software/0010_kwallet/kdewallet.salt
+++ b/client_software/0010_kwallet/kdewallet.salt
@@ -1 +1 @@
-)���8��b��S����[ڑ����O�I.���V~̃P�|^�8�YO�4�Ľ�<�
\ No newline at end of file
+<�p���3������)u�3G����ń}6:� ��00��+��6��K�8,%q�n�
\ No newline at end of file