diff --git a/kali-config/common/includes.chroot/usr/lib/live/config/0031-kali-user-setup b/kali-config/common/includes.chroot/usr/lib/live/config/0031-kali-user-setup
index 5fc6df0..31af2ba 100755
--- a/kali-config/common/includes.chroot/usr/lib/live/config/0031-kali-user-setup
+++ b/kali-config/common/includes.chroot/usr/lib/live/config/0031-kali-user-setup
@@ -22,9 +22,12 @@ configure_usergroups() {
     # dialout - for serial port access
     # kaboxer - for kaboxer
     # wireshark - capture sessions without being root
-    kali_groups="adm,dialout,kaboxer,wireshark"
+    kali_groups="adm dialout kaboxer wireshark"
 
-    usermod -a -G $kali_groups kali || true
+    for grp in $kali_groups; do
+	getent group $grp >/dev/null || continue
+	usermod -a -G $grp kali
+    done
 }
 
 # Avoid configuring multiple times in case persistence is enabled
diff --git a/kali-config/common/includes.installer/kali-finish-install b/kali-config/common/includes.installer/kali-finish-install
index 11e7e2e..74c4322 100755
--- a/kali-config/common/includes.installer/kali-finish-install
+++ b/kali-config/common/includes.installer/kali-finish-install
@@ -60,11 +60,14 @@ configure_usergroups() {
     # dialout - for serial access
     # kaboxer - for kaboxer
     # wireshark - capture sessions in wireshark
-    kali_groups="adm,dialout,kaboxer,wireshark"
+    kali_groups="adm dialout kaboxer wireshark"
 
     for user in $(get_user_list | grep -xv root); do
 	echo "INFO: adding user '$user' to groups '$kali_groups'"
-	usermod -a -G "$kali_groups" $user || true
+	for grp in $kali_groups; do
+	    getent group $grp >/dev/null || continue
+	    usermod -a -G $grp $user
+	done
     done
 }