diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup
index 4f30149b..17e947e3 100755
--- a/src/freedombone-utils-setup
+++ b/src/freedombone-utils-setup
@@ -361,6 +361,10 @@ function disable_nfs_insecure_locks {
     fi
 }
 
+function set_login_umask {
+    sed -i 's|UMASK\t.*|UMASK\t\t077|g' /etc/login.defs
+}
+
 function setup_firewall {
     function_check create_completion_file
     create_completion_file
@@ -391,6 +395,9 @@ function setup_utils {
     function_check disable_nfs_insecure_locks
     disable_nfs_insecure_locks
 
+    function_check set_login_umask
+    set_login_umask
+
     function_check turn_off_rsys_logging
     turn_off_rsys_logging