diff --git a/src/freedombone-adduser b/src/freedombone-adduser
index 70657e71..19782046 100755
--- a/src/freedombone-adduser
+++ b/src/freedombone-adduser
@@ -75,8 +75,12 @@ fi
 MINIMUM_PASSWORD_LENGTH=$(cat /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-passwords | grep 'MINIMUM_PASSWORD_LENGTH=' | head -n 1 | awk -F '=' '{print $2}')
 
 NEW_USER_PASSWORD="$(openssl rand -base64 30 | cut -c1-${MINIMUM_PASSWORD_LENGTH})"
+chmod 700 /etc/shadow
+chmod 700 /etc/gshadow
 useradd -m -p "$NEW_USER_PASSWORD" -s /bin/bash $ADD_USERNAME
 adduser $ADD_USERNAME sasl
+chmod 0000 /etc/shadow
+chmod 0000 /etc/gshadow
 
 if [ ! -d /home/$ADD_USERNAME ]; then
     echo $'Home directory was not created'
diff --git a/src/freedombone-rmuser b/src/freedombone-rmuser
index 54fd8e30..f9d63186 100755
--- a/src/freedombone-rmuser
+++ b/src/freedombone-rmuser
@@ -136,7 +136,11 @@ do
     fi
 done
 
+chmod 700 /etc/shadow
+chmod 700 /etc/gshadow
 userdel -r $REMOVE_USERNAME
+chmod 0000 /etc/shadow
+chmod 0000 /etc/gshadow
 
 if [ -d /home/$REMOVE_USERNAME ]; then
     rm -rf /home/$REMOVE_USERNAME