diff --git a/src/freedombone-pass b/src/freedombone-pass
index 2f9a2838..b48373f7 100755
--- a/src/freedombone-pass
+++ b/src/freedombone-pass
@@ -247,7 +247,9 @@ if [ ${#CURR_PASSWORD} -eq 0 ]; then
 else
     # store password
     if [ -f $NO_PASSWORD_STORE_FILE ]; then
-        exit 0
+        if [[ "$CURR_USERNAME" != 'root' ]]; then
+            exit 0
+        fi
     fi
     if [ ! -d ~/.passwords/$CURR_USERNAME ]; then
         mkdir -p ~/.passwords/$CURR_USERNAME