diff --git a/custompkg/root/usr/local/bin/new-user-setup b/custompkg/root/usr/local/bin/new-user-setup
index 7a6c17a..2fdcf8a 100644
--- a/custompkg/root/usr/local/bin/new-user-setup
+++ b/custompkg/root/usr/local/bin/new-user-setup
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-# Copy files from /etc/skel to homedir
+# Overlay files from /etc/skel to homedir
 rsync --no-owner -avP /etc/skel/ $HOME/
 
 # run modular setup scripts
 for FN in $HOME/Library/user-setup/*.sh ; do
-    source $FN
-    rm $FN
+    bash "$FN"
+    rm "$FN"
 done
diff --git a/custompkg/scripts/postinstall b/custompkg/scripts/postinstall
index 4db1f47..0af475d 100755
--- a/custompkg/scripts/postinstall
+++ b/custompkg/scripts/postinstall
@@ -5,5 +5,5 @@ touch "$3"/var/db/.AppleDiagnosticsSetupDone
 touch "$3"/var/db/.AppleSetupDone
 
 chmod a+rx "$3"/usr/local/bin/*
-chmod -R a+r "$3"/etc/skel
+chmod -R a+rX "$3"/etc/skel