diff --git a/homedirs.sh b/homedirs.sh
index 61137796a6b5d969cbd1c225ecf535dcee624c0d..2e4613f57a773e8fced51ea21ac533ab9246613c 100755
--- a/homedirs.sh
+++ b/homedirs.sh
@@ -26,26 +26,26 @@ fi
 unset rusers
 rusers="$(getent group $rgroup | awk -F '[/:]' '{print $4}')"
 rusers="$rusers,$(getent group $localrgroup | awk -F '[/:]' '{print $4}')"
-IFS=$',' read -a ruserar <<< "$rusers"
+IFS=$',' read -r -a ruserar <<< "$rusers"
 for ruser in "${ruserar[@]}"
   do
     # create home directories
-    if [ ! -d $home$ruser ]
+    if [ ! -d "$home$ruser" ]
       then
-        /sbin/mkhomedir_helper $ruser $umask $skel
-        setfacl  -m u:$monitoringuser:rx $home$ruser
+        /sbin/mkhomedir_helper "$ruser" "$umask" "$skel"
+        setfacl  -m u:$monitoringuser:rx "$home$ruser"
     fi
     # symlink .rstudio directory to work storage
-    if [ ! -d $work$ruser/$rstudiodir ]
+    if [ ! -d "$work$ruser/$rstudiodir" ]
       then
-        mkdir -m 770 -p $work$ruser
-        mkdir -p $work$ruser/$rstudiodir
-        mkdir -p $home$ruser/$rstudiodir
-        setfacl  -m u:$monitoringuser:rx $work$ruser
-        setfacl  -m u:$monitoringuser:rx $work$ruser/$rstudiodir
-        setfacl  -m u:$ruser:rwx $work$ruser
-        setfacl  -m u:$ruser:rwx $work$ruser/$rstudiodir
-        mount --bind $work$ruser/$rstudiodir $home$ruser/$rstudiodir
+        mkdir -m 770 -p "$work$ruser"
+        mkdir -p "$work$ruser/$rstudiodir"
+        mkdir -p "$home$ruser/$rstudiodir"
+        setfacl  -m u:"$monitoringuser":rx "$work$ruser"
+        setfacl  -m u:"$monitoringuser":rx "$work$ruser/$rstudiodir"
+        seufacl  -m u:"$ruser":rwx "$work$ruser"
+        setfacl  -m u:"$ruser":rwx "$work$ruser/$rstudiodir"
+        mount --bind "$work$ruser/$rstudiodir" "$home$ruser/$rstudiodir"
         #ln -s $work$ruser/$rstudiodir $home$ruser/$rstudiodir
         #chattr +i $home$ruser/$rstudiodir
     fi