diff --git a/data/profile.conf.example b/data/profile.conf.example
index cbd812a83b86eb78d48fbec5104a5d34f3bcb551..51dbf531c800e9861608d48877ac2b02fc6bb2c0 100644
--- a/data/profile.conf.example
+++ b/data/profile.conf.example
@@ -43,6 +43,12 @@
 # the same workgroup name if samba is used
 # smb_workgroup="Manjaro"
 
+# default system shell is bash
+# '/etc/defaults/useradd': " "
+# userShell              : "/bin/zsh"
+# empty value will not be used
+#user_shell=
+
 ################# live-session #################
 
 # unset defaults to given value
diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh
index 9b489c50e99e39bad1aff2549b7a7dfa07bf7d7c..a1a68e2658dc336e2b4b4507af4d89847e0ba33f 100644
--- a/lib/util-yaml.sh
+++ b/lib/util-yaml.sh
@@ -148,6 +148,9 @@ write_users_conf(){
     echo "doReusePassword: false" >> "$conf" # only used in old 'users' module
     echo "availableShells: /bin/bash, /bin/zsh" >> "$conf" # only used in new 'users' module
     echo "avatarFilePath:  ~/.face" >> "$conf" # mostly used file-name for avatar
+    if [[ -n "$user_shell" ]]; then
+        echo "userShell:       $user_shell" >> "$conf"
+    fi    
 }
 
 write_packages_conf(){