diff --git a/scripts/lock.sh b/scripts/lock.sh
index eb99670..270035b 100644
--- a/scripts/lock.sh
+++ b/scripts/lock.sh
@@ -2,5 +2,5 @@
 # Locks the data
 # @author Kevin Veen-Birkenbach [aka. Frantz]
 DECRYPTED=$(readlink -f "$(dirname "$(readlink -f "${0}")")/../data");
-echo "Locking directory: $DECRYPTED"
-fusermount -u $DECRYPTED && echo "Data is now encrypted."
+echo "Locking directory $DECRYPTED..."
+fusermount -u $DECRYPTED && echo "Data is now encrypted." && echo "Removing directory $DECRYPTED..." && rmdir $DECRYPTED
diff --git a/scripts/unlock.sh b/scripts/unlock.sh
index cecda5b..7f7d186 100644
--- a/scripts/unlock.sh
+++ b/scripts/unlock.sh
@@ -3,5 +3,8 @@
 # @author Kevin Veen-Birkenbach [aka. Frantz]
 ENCRYPTED=$(readlink -f "$(dirname "$(readlink -f "${0}")")/../.encrypted");
 DECRYPTED=$(readlink -f "$(dirname "$(readlink -f "${0}")")/../data");
-echo "Unlocking directory: $DECRYPTED"
+echo "Unlocking directory $DECRYPTED..."
+echo "Creating directory $DECRYPTED..."
+mkdir $DECRYPTED
+echo "Encrypting directory $DECRYPTED to $DECRYPTED..."
 encfs $ENCRYPTED $DECRYPTED && echo "ATTENTION: DATA IS NOW DECRYPTED!"