Add -g option (GECOS/comment) to adduser in scripts.

This way we can avoid ugly default:

    Linux user,,,

92 files changed, 95 insertions, 94 deletions

diff --git a/main/amavisd-new/amavisd-new.pre-install b/main/amavisd-new/amavisd-new.pre-install
index bd8c3a6fe..d0c07006d 100755
--- a/main/amavisd-new/amavisd-new.pre-install
+++ b/main/amavisd-new/amavisd-new.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S amavis 2>/dev/null
-adduser -S -D -G amavis -h /var/amavis -s /sbin/nologin amavis 2>/dev/null
+adduser -S -D -G amavis -h /var/amavis -s /sbin/nologin -g amavis amavis 2>/dev/null
 exit 0
 
diff --git a/main/apache2/apache2.pre-install b/main/apache2/apache2.pre-install
index 81f4b068b..cb803238f 100644
--- a/main/apache2/apache2.pre-install
+++ b/main/apache2/apache2.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -h /var/www -s /sbin/nologin -D apache 2>/dev/null
+adduser -S -H -h /var/www -s /sbin/nologin -D -g apache apache 2>/dev/null
 addgroup apache www-data 2>/dev/null
 exit 0
diff --git a/main/aports-build/aports-build.pre-install b/main/aports-build/aports-build.pre-install
index 21bf10683..a4928ebe7 100644
--- a/main/aports-build/aports-build.pre-install
+++ b/main/aports-build/aports-build.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -D buildozer -s /bin/sh 2>/dev/null
+adduser -S -D -g buildozer buildozer -s /bin/sh 2>/dev/null
 exit 0
diff --git a/main/arpwatch/arpwatch.pre-install b/main/arpwatch/arpwatch.pre-install
index d09fad48b..d75874fc4 100644
--- a/main/arpwatch/arpwatch.pre-install
+++ b/main/arpwatch/arpwatch.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -S -H -s /sbin/nologin -D arpwatch 2>/dev/null
+adduser -S -H -s /sbin/nologin -D -g arpwatch arpwatch 2>/dev/null
 exit 0
 
diff --git a/main/asterisk/asterisk.pre-install b/main/asterisk/asterisk.pre-install
index 80b7e678a..935466dde 100644
--- a/main/asterisk/asterisk.pre-install
+++ b/main/asterisk/asterisk.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/asterisk -s /sbin/nologin -D asterisk 2>/dev/null
+adduser -S -h /var/lib/asterisk -s /sbin/nologin -D -g asterisk asterisk 2>/dev/null
 addgroup -S dialout 2>/dev/null
 addgroup asterisk dialout 2>/dev/null
 exit 0
diff --git a/main/asterisk/asterisk.pre-upgrade b/main/asterisk/asterisk.pre-upgrade
index 6c2984ae4..781d5d887 100644
--- a/main/asterisk/asterisk.pre-upgrade
+++ b/main/asterisk/asterisk.pre-upgrade
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/asterisk -s /bin/false -D asterisk 2>/dev/null
+adduser -S -h /var/lib/asterisk -s /bin/false -D -g asterisk asterisk 2>/dev/null
 addgroup -S dialout 2>/dev/null
 addgroup asterisk dialout 2>/dev/null
 exit 0
diff --git a/main/bacula-client/bacula-client.pre-install b/main/bacula-client/bacula-client.pre-install
index 0eb2cab34..7827de601 100644
--- a/main/bacula-client/bacula-client.pre-install
+++ b/main/bacula-client/bacula-client.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S bacula 2>/dev/null
-adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D bacula 2>/dev/null
+adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D -g bacula bacula 2>/dev/null
 exit 0
diff --git a/main/bacula/bacula.pre-install b/main/bacula/bacula.pre-install
index 0eb2cab34..7827de601 100644
--- a/main/bacula/bacula.pre-install
+++ b/main/bacula/bacula.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S bacula 2>/dev/null
-adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D bacula 2>/dev/null
+adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D -g bacula bacula 2>/dev/null
 exit 0
diff --git a/main/bind/bind.pre-install b/main/bind/bind.pre-install
index 3770738af..116d51eec 100644
--- a/main/bind/bind.pre-install
+++ b/main/bind/bind.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S named 2>/dev/null
-adduser -S -h /etc/bind -s /sbin/nologin -G named -D named 2>/dev/null
+adduser -S -h /etc/bind -s /sbin/nologin -G named -D -g named named 2>/dev/null
 exit 0
 
diff --git a/main/charybdis/charybdis.pre-install b/main/charybdis/charybdis.pre-install
index 3c120d30a..83ffff312 100644
--- a/main/charybdis/charybdis.pre-install
+++ b/main/charybdis/charybdis.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -h /var/run/charybdis -s /sbin/nologin -D ircd 2>/dev/null
+adduser -S -h /var/run/charybdis -s /sbin/nologin -D -g ircd ircd 2>/dev/null
 exit 0
diff --git a/main/chrony/chrony.pre-install b/main/chrony/chrony.pre-install
index 83c456056..41e01c6ca 100644
--- a/main/chrony/chrony.pre-install
+++ b/main/chrony/chrony.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S chrony 2>/dev/null
-adduser -S -G chrony -h /var/log/chrony -s /sbin/nologin -D chrony 2>/dev/null
+adduser -S -G chrony -h /var/log/chrony -s /sbin/nologin -D -g chrony chrony 2>/dev/null
 exit 0
diff --git a/main/clamav/clamav-daemon.pre-install b/main/clamav/clamav-daemon.pre-install
index 4528fbb2c..5ef833a7a 100644
--- a/main/clamav/clamav-daemon.pre-install
+++ b/main/clamav/clamav-daemon.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S clamav 2>/dev/null
-adduser -S -h /var/lib/clamav -H -s /sbin/nologin -D -G clamav clamav 2>/dev/null
+adduser -S -h /var/lib/clamav -H -s /sbin/nologin -D -G clamav -g clamav clamav 2>/dev/null
 exit 0
diff --git a/main/clamav/clamav-db.pre-install b/main/clamav/clamav-db.pre-install
index 9bc70ddaa..f46eabe8b 100644
--- a/main/clamav/clamav-db.pre-install
+++ b/main/clamav/clamav-db.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -H -s /sbin/nologin -D clamav 2>/dev/null
+adduser -S -H -s /sbin/nologin -D -g clamav clamav 2>/dev/null
 exit 0
diff --git a/main/clamav/freshclam.pre-install b/main/clamav/freshclam.pre-install
index 4528fbb2c..5ef833a7a 100644
--- a/main/clamav/freshclam.pre-install
+++ b/main/clamav/freshclam.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S clamav 2>/dev/null
-adduser -S -h /var/lib/clamav -H -s /sbin/nologin -D -G clamav clamav 2>/dev/null
+adduser -S -h /var/lib/clamav -H -s /sbin/nologin -D -G clamav -g clamav clamav 2>/dev/null
 exit 0
diff --git a/main/clamsmtp/clamsmtp.pre-install b/main/clamsmtp/clamsmtp.pre-install
index 9bc70ddaa..f46eabe8b 100644
--- a/main/clamsmtp/clamsmtp.pre-install
+++ b/main/clamsmtp/clamsmtp.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -H -s /sbin/nologin -D clamav 2>/dev/null
+adduser -S -H -s /sbin/nologin -D -g clamav clamav 2>/dev/null
 exit 0
diff --git a/main/clamsmtp/clamsmtp.pre-upgrade b/main/clamsmtp/clamsmtp.pre-upgrade
index 7e736a2d4..c673e278e 100644
--- a/main/clamsmtp/clamsmtp.pre-upgrade
+++ b/main/clamsmtp/clamsmtp.pre-upgrade
@@ -10,5 +10,5 @@ if [ -f "$old" ] && [ ! -f "$new" ]; then
 	echo " *"
 fi
 
-adduser -S -H -s /bin/false -D clamav 2>/dev/null
+adduser -S -H -s /bin/false -D -g clamav clamav 2>/dev/null
 exit 0
diff --git a/main/coova-chilli/coova-chilli.pre-install b/main/coova-chilli/coova-chilli.pre-install
index 6ef874198..15de617e5 100644
--- a/main/coova-chilli/coova-chilli.pre-install
+++ b/main/coova-chilli/coova-chilli.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -S -H -s /sbin/nologin -D chilli 2>/dev/null
+adduser -S -H -s /sbin/nologin -D -g chilli chilli 2>/dev/null
 exit 0
 
diff --git a/main/cups/cups.pre-install b/main/cups/cups.pre-install
index 468163cfe..4b099d8a2 100644
--- a/main/cups/cups.pre-install
+++ b/main/cups/cups.pre-install
@@ -2,6 +2,6 @@
 
 addgroup -S lpadmin 2>/dev/null
 addgroup -S lp 2>/dev/null
-adduser -S -G lp lp 2>/dev/null
+adduser -S -G lp -g lp lp 2>/dev/null
 addgroup lp lp 2>/dev/null
 exit 0
diff --git a/main/cvechecker/cvechecker.pre-install b/main/cvechecker/cvechecker.pre-install
index cf6b14483..b6981179a 100644
--- a/main/cvechecker/cvechecker.pre-install
+++ b/main/cvechecker/cvechecker.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
 addgroup -S cvechecker &>/dev/null
-adduser -S cvechecker -h /var/cvechecker -DG cvechecker &>/dev/null
+adduser -S -g cvechecker cvechecker -h /var/cvechecker -DG cvechecker &>/dev/null
diff --git a/main/dansguardian/dansguardian.pre-install b/main/dansguardian/dansguardian.pre-install
index f5c8bbf96..e897f8c83 100644
--- a/main/dansguardian/dansguardian.pre-install
+++ b/main/dansguardian/dansguardian.pre-install
@@ -5,5 +5,6 @@ adduser -S -D -H \
 	-h /var/log/dansguardian \
 	-s /sbin/nologin \
 	-G dansguar \
+	-g dansguar \
 	dansguar 2>/dev/null || true
 
diff --git a/main/darkhttpd/darkhttpd.pre-install b/main/darkhttpd/darkhttpd.pre-install
index 80cfa6b94..b189233ae 100644
--- a/main/darkhttpd/darkhttpd.pre-install
+++ b/main/darkhttpd/darkhttpd.pre-install
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin -D darkhttpd \
-	2>/dev/null
+adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin -D -g darkhttpd \
+	darkhttpd 2>/dev/null
 addgroup darkhttpd www-data 2>/dev/null
 
 exit 0
diff --git a/main/dbus/dbus.pre-install b/main/dbus/dbus.pre-install
index 57f9f54af..7fdb08a69 100644
--- a/main/dbus/dbus.pre-install
+++ b/main/dbus/dbus.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S messagebus 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D messagebus -G messagebus 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -g messagebus messagebus -G messagebus 2>/dev/null
 exit 0
diff --git a/main/dhcp/dhcp.pre-install b/main/dhcp/dhcp.pre-install
index 27fa93f82..5aaa6c4b7 100644
--- a/main/dhcp/dhcp.pre-install
+++ b/main/dhcp/dhcp.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/dhcp -s /sbin/nologin -D dhcp 2>/dev/null
+adduser -S -h /var/lib/dhcp -s /sbin/nologin -D -g dhcp dhcp 2>/dev/null
 exit 0
 
diff --git a/main/distcc/distcc.pre-install b/main/distcc/distcc.pre-install
index b07f8467f..b408b4a12 100644
--- a/main/distcc/distcc.pre-install
+++ b/main/distcc/distcc.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S distcc 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -G distcc -D distcc 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -G distcc -D -g distcc distcc 2>/dev/null
 exit 0
diff --git a/main/dnsmasq/dnsmasq.pre-install b/main/dnsmasq/dnsmasq.pre-install
index 3e9e4b081..43f60b8e6 100644
--- a/main/dnsmasq/dnsmasq.pre-install
+++ b/main/dnsmasq/dnsmasq.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S dnsmasq 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -G dnsmasq -D dnsmasq 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -G dnsmasq -D -g dnsmasq dnsmasq 2>/dev/null
 exit 0
diff --git a/main/dovecot/dovecot.pre-install b/main/dovecot/dovecot.pre-install
index 58346c66f..481132bf7 100644
--- a/main/dovecot/dovecot.pre-install
+++ b/main/dovecot/dovecot.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -u 90 -H -h /dev/null -s /sbin/nologin -D dovecot 2>/dev/null
-adduser -S -u 91 -H -h /dev/null -s /sbin/nologin -D dovenull 2>/dev/null
+adduser -S -u 90 -H -h /dev/null -s /sbin/nologin -D -g dovecot dovecot 2>/dev/null
+adduser -S -u 91 -H -h /dev/null -s /sbin/nologin -D -g dovenull dovenull 2>/dev/null
 exit 0
diff --git a/main/ez-ipupdate/ez-ipupdate.pre-install b/main/ez-ipupdate/ez-ipupdate.pre-install
index 064e418f4..23d9faef7 100644
--- a/main/ez-ipupdate/ez-ipupdate.pre-install
+++ b/main/ez-ipupdate/ez-ipupdate.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/ez-ipupdate -s /sbin/nologin -D ipupdate 2>/dev/null
+adduser -S -h /var/lib/ez-ipupdate -s /sbin/nologin -D -g ipupdate ipupdate 2>/dev/null
 exit 0
 
diff --git a/main/fetchmail/fetchmail.pre-install b/main/fetchmail/fetchmail.pre-install
index 2961b9a01..67681f8ed 100644
--- a/main/fetchmail/fetchmail.pre-install
+++ b/main/fetchmail/fetchmail.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -H -h /var/lib/fetchmail -s /sbin/nologin -D fetchmail 2>/dev/null
+adduser -S -H -h /var/lib/fetchmail -s /sbin/nologin -D -g fetchmail fetchmail 2>/dev/null
 exit 0
diff --git a/main/freeradius/freeradius.pre-install b/main/freeradius/freeradius.pre-install
index b81e86d7a..f02c2c07b 100644
--- a/main/freeradius/freeradius.pre-install
+++ b/main/freeradius/freeradius.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S radius 2>/dev/null
-adduser -S -G radius -h /var/log/radius -s /sbin/nologin -D radius 2>/dev/null
+adduser -S -G radius -h /var/log/radius -s /sbin/nologin -D -g radius radius 2>/dev/null
 exit 0
 
diff --git a/main/freeswitch/freeswitch.pre-install b/main/freeswitch/freeswitch.pre-install
index 4dccd578c..f175cd362 100755
--- a/main/freeswitch/freeswitch.pre-install
+++ b/main/freeswitch/freeswitch.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /var/run/freeswitch -s /sbin/nologin -D freeswitch 2>/dev/null
+adduser -S -H -h /var/run/freeswitch -s /sbin/nologin -D -g freeswitch freeswitch 2>/dev/null
 
 exit 0
diff --git a/main/gdnsd/gdnsd.pre-install b/main/gdnsd/gdnsd.pre-install
index 247946687..040e7f11d 100644
--- a/main/gdnsd/gdnsd.pre-install
+++ b/main/gdnsd/gdnsd.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S gdnsd 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd gdnsd 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd -g gdnsd gdnsd 2>/dev/null
 exit 0
diff --git a/main/gitolite/gitolite.pre-install b/main/gitolite/gitolite.pre-install
index fbb1e2a12..2d155abb2 100644
--- a/main/gitolite/gitolite.pre-install
+++ b/main/gitolite/gitolite.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -H -h /var/lib/git -s /bin/sh -D git 2>/dev/null
+adduser -S -H -h /var/lib/git -s /bin/sh -D -g git git 2>/dev/null
 exit 0
diff --git a/main/gnats/gnats.pre-install b/main/gnats/gnats.pre-install
index 849841fa6..81093a42a 100644
--- a/main/gnats/gnats.pre-install
+++ b/main/gnats/gnats.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/gnatsdb -D gnats 2>/dev/null
+adduser -S -h /var/lib/gnatsdb -D -g gnats gnats 2>/dev/null
 exit 0
diff --git a/main/gross/gross.pre-install b/main/gross/gross.pre-install
index f79e65773..d3a5f857b 100644
--- a/main/gross/gross.pre-install
+++ b/main/gross/gross.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -H -s /sbin/nologin -D gross 2>/dev/null
+adduser -S -H -s /sbin/nologin -D -g gross gross 2>/dev/null
 exit 0
diff --git a/main/haproxy/haproxy.pre-install b/main/haproxy/haproxy.pre-install
index 470695636..72b8ab008 100644
--- a/main/haproxy/haproxy.pre-install
+++ b/main/haproxy/haproxy.pre-install
@@ -2,7 +2,7 @@
 
 addgroup -S haproxy 2>/dev/null
 adduser -S -H -h /var/lib/haproxy -s /bin/false -D \
-	-G haproxy haproxy 2>/dev/null
+	-G haproxy -g haproxy haproxy 2>/dev/null
 
 # move config to new location
 if [ -e /etc/haproxy.cfg ] && ! [ -e /etc/haproxy/haproxy.cfg ]; then
diff --git a/main/haproxy/haproxy.pre-upgrade b/main/haproxy/haproxy.pre-upgrade
index 470695636..72b8ab008 100644
--- a/main/haproxy/haproxy.pre-upgrade
+++ b/main/haproxy/haproxy.pre-upgrade
@@ -2,7 +2,7 @@
 
 addgroup -S haproxy 2>/dev/null
 adduser -S -H -h /var/lib/haproxy -s /bin/false -D \
-	-G haproxy haproxy 2>/dev/null
+	-G haproxy -g haproxy haproxy 2>/dev/null
 
 # move config to new location
 if [ -e /etc/haproxy.cfg ] && ! [ -e /etc/haproxy/haproxy.cfg ]; then
diff --git a/main/icecast/icecast.pre-install b/main/icecast/icecast.pre-install
index 9978a4be9..8734c1e13 100644
--- a/main/icecast/icecast.pre-install
+++ b/main/icecast/icecast.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/log/icecast -s /sbin/nologin -D icecast  2>/dev/null
+adduser -S -h /var/log/icecast -s /sbin/nologin -D -g icecast icecast  2>/dev/null
 
 exit 0
diff --git a/main/ircservices/ircservices.pre-install b/main/ircservices/ircservices.pre-install
index 5016c8933..4f6144a95 100644
--- a/main/ircservices/ircservices.pre-install
+++ b/main/ircservices/ircservices.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/ircservices -s /sbin/nologin -D ircservices 2>/dev/null
+adduser -S -h /var/lib/ircservices -s /sbin/nologin -D -g ircservices ircservices 2>/dev/null
 exit 0
 
diff --git a/main/kamailio/kamailio.pre-install b/main/kamailio/kamailio.pre-install
index fd7b13e48..19d11f5c2 100644
--- a/main/kamailio/kamailio.pre-install
+++ b/main/kamailio/kamailio.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S kamailio 2>/dev/null
-adduser -S -H -h /var/empty -s /sbin/nologin -D -G kamailio kamailio  2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -G kamailio -g kamailio kamailio  2>/dev/null
 
 exit 0
diff --git a/main/lighttpd/lighttpd.pre-install b/main/lighttpd/lighttpd.pre-install
index 2349478f2..80f256276 100644
--- a/main/lighttpd/lighttpd.pre-install
+++ b/main/lighttpd/lighttpd.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin -D lighttpd 2>/dev/null
+adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin -D -g lighttpd lighttpd 2>/dev/null
 addgroup lighttpd www-data 2>/dev/null
 
 exit 0
diff --git a/main/logcheck/logcheck.pre-install b/main/logcheck/logcheck.pre-install
index b0f2a8397..ea6028c49 100644
--- a/main/logcheck/logcheck.pre-install
+++ b/main/logcheck/logcheck.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S logcheck 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G logcheck logcheck 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G logcheck -g logcheck logcheck 2>/dev/null
 exit 0
diff --git a/main/mariadb/mariadb.pre-install b/main/mariadb/mariadb.pre-install
index 5b68b1ea4..e4f16d2dd 100644
--- a/main/mariadb/mariadb.pre-install
+++ b/main/mariadb/mariadb.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S mysql 2>/dev/null
-adduser -S -h /var/lib/mysql -s /sbin/nologin -G mysql -D mysql 2>/dev/null
+adduser -S -h /var/lib/mysql -s /sbin/nologin -G mysql -D -g mysql mysql 2>/dev/null
 exit 0
 
diff --git a/main/memcached/memcached.pre-install b/main/memcached/memcached.pre-install
index 6612df975..df22cd5fd 100644
--- a/main/memcached/memcached.pre-install
+++ b/main/memcached/memcached.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -s /sbin/nologin -D memcached 2>/dev/null
+adduser -S -H -s /sbin/nologin -D -g memcached memcached 2>/dev/null
 exit 0
 
diff --git a/main/mini_httpd/mini_httpd.pre-install b/main/mini_httpd/mini_httpd.pre-install
index 3b5258af4..63876f773 100644
--- a/main/mini_httpd/mini_httpd.pre-install
+++ b/main/mini_httpd/mini_httpd.pre-install
@@ -9,7 +9,7 @@ fi
 
 addgroup -S -g 82 www-data 2>/dev/null
 adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin \
-        -D minihttpd 2>/dev/null
+        -D -g minihttpd minihttpd 2>/dev/null
 addgroup minihttpd www-data 2>/dev/null
 
 exit 0
diff --git a/main/minidlna/minidlna.pre-install b/main/minidlna/minidlna.pre-install
index 78fb2d47d..4423a73e6 100644
--- a/main/minidlna/minidlna.pre-install
+++ b/main/minidlna/minidlna.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S minidlna 2>/dev/null
 adduser -S -H -h /var/run/minidlna -s /sbin/nologin -D -G minidlna \
-	minidlna 2>/dev/null
+	-g minidlna minidlna 2>/dev/null
 exit 0
diff --git a/main/mlmmj/mlmmj.pre-install b/main/mlmmj/mlmmj.pre-install
index 38b8fb839..046a821dc 100644
--- a/main/mlmmj/mlmmj.pre-install
+++ b/main/mlmmj/mlmmj.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S mlmmj 2>/dev/null
-adduser -S -H -h /var/spool/mlmmj -s /sbin/nologin -D -G mlmmj mlmmj 2>/dev/null
+adduser -S -H -h /var/spool/mlmmj -s /sbin/nologin -D -G mlmmj -g mlmmj mlmmj 2>/dev/null
 exit 0
diff --git a/main/mosquitto/mosquitto.pre-install b/main/mosquitto/mosquitto.pre-install
index 026fe2c1c..a0a8f7269 100644
--- a/main/mosquitto/mosquitto.pre-install
+++ b/main/mosquitto/mosquitto.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S mosquitto 2>/dev/null
-adduser -S -H -h /var/empty -s /sbin/nologin -D -G mosquitto mosquitto 2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -G mosquitto -g mosquitto mosquitto 2>/dev/null
 exit 0
diff --git a/main/mpd/mpd.pre-install b/main/mpd/mpd.pre-install
index 70bddb21d..7e012f898 100644
--- a/main/mpd/mpd.pre-install
+++ b/main/mpd/mpd.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/mpd -s /sbin/nologin -G audio -D mpd 2>/dev/null || true
+adduser -S -h /var/lib/mpd -s /sbin/nologin -G audio -D -g mpd mpd 2>/dev/null || true
diff --git a/main/nagios/nagios.pre-install b/main/nagios/nagios.pre-install
index dad8a0eea..d9c0f3c9f 100644
--- a/main/nagios/nagios.pre-install
+++ b/main/nagios/nagios.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S nagios 2>/dev/null
-adduser -S -G nagios -H -h /var/nagios -s /sbin/nologin nagios 2>/dev/null
+adduser -S -G nagios -H -h /var/nagios -s /sbin/nologin -g nagios nagios 2>/dev/null
 exit 0
diff --git a/main/nginx-initscripts/nginx-initscripts.pre-install b/main/nginx-initscripts/nginx-initscripts.pre-install
index 63db1e99c..00bd0dedf 100644
--- a/main/nginx-initscripts/nginx-initscripts.pre-install
+++ b/main/nginx-initscripts/nginx-initscripts.pre-install
@@ -3,7 +3,7 @@
 addgroup -S -g 82 www-data 2>/dev/null
 addgroup -S nginx 2>/dev/null
 adduser -S -G nginx -H -h /var/www/localhost/htdocs -s /sbin/nologin \
-	-D nginx 2>/dev/null
+	-D -g nginx nginx 2>/dev/null
 addgroup nginx www-data 2>/dev/null
 
 exit 0
diff --git a/main/ngircd/ngircd.pre-install b/main/ngircd/ngircd.pre-install
index 5c8d34b6d..036c9aba8 100644
--- a/main/ngircd/ngircd.pre-install
+++ b/main/ngircd/ngircd.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -H -h /etc/ngircd -s /sbin/nologin -D ngircd 2>/dev/null
+adduser -S -H -h /etc/ngircd -s /sbin/nologin -D -g ngircd ngircd 2>/dev/null
 exit 0
diff --git a/main/nrpe/nrpe.pre-install b/main/nrpe/nrpe.pre-install
index a9a0d3895..7ee629b58 100644
--- a/main/nrpe/nrpe.pre-install
+++ b/main/nrpe/nrpe.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /dev/null -s /sbin/nologin -D nagios 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -g nagios nagios 2>/dev/null
 addgroup -S nagios 2>/dev/null
 exit 0
diff --git a/main/nsd/nsd.pre-install b/main/nsd/nsd.pre-install
index 7f92eca5f..106ac00cc 100644
--- a/main/nsd/nsd.pre-install
+++ b/main/nsd/nsd.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S nsd 2>/dev/null
-adduser -S -G nsd -H -h /var/db/nsd -s /sbin/nologin nsd 2>/dev/null
+adduser -S -G nsd -H -h /var/db/nsd -s /sbin/nologin -g nsd nsd 2>/dev/null
 exit 0
diff --git a/main/nss-pam-ldapd/nss-pam-ldapd.pre-install b/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
index 5d30b9ca1..5a7076fa8 100644
--- a/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
+++ b/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
@@ -5,5 +5,5 @@ groupname=$username
 
 addgroup -S $username 2>/dev/null
 adduser -S -H -h /var/run/$username -s /sbin/nologin -D -G $groupname \
-	$username 2>/dev/null
+	-g $username $username 2>/dev/null
 exit 0
diff --git a/main/ntop/ntop.pre-install b/main/ntop/ntop.pre-install
index e22ff3e3d..2386dc806 100755
--- a/main/ntop/ntop.pre-install
+++ b/main/ntop/ntop.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S ntop 2>/dev/null
-adduser -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D ntop 2>/dev/null
+adduser -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D -g ntop ntop 2>/dev/null
 exit 0
diff --git a/main/openntpd/openntpd.pre-install b/main/openntpd/openntpd.pre-install
index feb5d9cb9..997e7bf82 100644
--- a/main/openntpd/openntpd.pre-install
+++ b/main/openntpd/openntpd.pre-install
@@ -2,6 +2,6 @@
 
 # this user should be included in alpine-baselayout-1.2.
 # included here for backward compability.
-adduser -S -H -h /var/empty -s /sbin/nologin -D ntp  2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -g ntp ntp  2>/dev/null
 
 exit 0
diff --git a/main/opentracker/opentracker.pre-install b/main/opentracker/opentracker.pre-install
index 8d619f67b..2e591dbb9 100644
--- a/main/opentracker/opentracker.pre-install
+++ b/main/opentracker/opentracker.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -D -H -h /var/empty -s /sbin/false opentracker 2>/dev/null
+adduser -S -D -H -h /var/empty -s /sbin/false -g opentracker opentracker 2>/dev/null
 exit 0
 
diff --git a/main/openvpn/openvpn.pre-install b/main/openvpn/openvpn.pre-install
index 0f39d06d6..37e0bf253 100644
--- a/main/openvpn/openvpn.pre-install
+++ b/main/openvpn/openvpn.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S openvpn 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G openvpn openvpn 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G openvpn -g openvpn openvpn 2>/dev/null
 exit 0
diff --git a/main/pcsc-lite/pcsc-lite.pre-install b/main/pcsc-lite/pcsc-lite.pre-install
index 1c1ba3c41..192e10e61 100644
--- a/main/pcsc-lite/pcsc-lite.pre-install
+++ b/main/pcsc-lite/pcsc-lite.pre-install
@@ -5,5 +5,5 @@ groupname=$username
 
 addgroup -S $username 2>/dev/null
 adduser -S -H -h /var/run/$username -s /sbin/nologin -D -G $groupname \
-	$username 2>/dev/null
+	-g $username $username 2>/dev/null
 exit 0
diff --git a/main/pdnsd/pdnsd.pre-install b/main/pdnsd/pdnsd.pre-install
index 247928c4f..b916dab59 100644
--- a/main/pdnsd/pdnsd.pre-install
+++ b/main/pdnsd/pdnsd.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -H -h /var/cache/pdnsd -s /sbin/nologin pdnsd 2>/dev/null
+adduser -S -H -h /var/cache/pdnsd -s /sbin/nologin -g pdnsd pdnsd 2>/dev/null
 exit 0
diff --git a/main/perdition/perdition.pre-install b/main/perdition/perdition.pre-install
index 5d9148fcb..1c0b01e33 100644
--- a/main/perdition/perdition.pre-install
+++ b/main/perdition/perdition.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S perdition 2>/dev/null
-adduser -S -h /var/run/perdition -s /sbin/nologin -G perdition -D perdition 2>/dev/null
+adduser -S -h /var/run/perdition -s /sbin/nologin -G perdition -D -g perdition perdition 2>/dev/null
 
 exit 0
diff --git a/main/postfix/postfix.pre-install b/main/postfix/postfix.pre-install
index c3fc668dc..6a5957030 100644
--- a/main/postfix/postfix.pre-install
+++ b/main/postfix/postfix.pre-install
@@ -2,9 +2,9 @@
 
 addgroup -S postfix 2>/dev/null
 addgroup -S postdrop 2>/dev/null
-adduser -S -h /var/spool/postfix -G postfix postfix 2>/dev/null
+adduser -S -h /var/spool/postfix -G postfix -g postfix postfix 2>/dev/null
 addgroup postfix mail 2>/dev/null
-adduser -S -H -s /sbin/nologin -h /var/mail/domains -G postdrop vmail 2>/dev/null
+adduser -S -H -s /sbin/nologin -h /var/mail/domains -G postdrop -g vmail vmail 2>/dev/null
 
 
 exit 0
diff --git a/main/postgrey/postgrey.pre-install b/main/postgrey/postgrey.pre-install
index 480391cce..e745acfa1 100644
--- a/main/postgrey/postgrey.pre-install
+++ b/main/postgrey/postgrey.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S postgrey 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D postgrey  2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -g postgrey postgrey  2>/dev/null
 
 exit 0
diff --git a/main/privoxy/privoxy.pre-install b/main/privoxy/privoxy.pre-install
index 72a917e4f..72b4ac177 100644
--- a/main/privoxy/privoxy.pre-install
+++ b/main/privoxy/privoxy.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S privoxy 2>/dev/null
-adduser -S -G privoxy -h /var/log/privoxy -s /sbin/nologin -D privoxy 2>/dev/null
+adduser -S -G privoxy -h /var/log/privoxy -s /sbin/nologin -D -g privoxy privoxy 2>/dev/null
 exit 0
 
diff --git a/main/quagga-nhrp/quagga-nhrp.pre-install b/main/quagga-nhrp/quagga-nhrp.pre-install
index c0fe3c8c5..f8340fa26 100644
--- a/main/quagga-nhrp/quagga-nhrp.pre-install
+++ b/main/quagga-nhrp/quagga-nhrp.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S quagga 2>/dev/null
-adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga quagga 2>/dev/null
+adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga -g quagga quagga 2>/dev/null
 exit 0
 
diff --git a/main/quagga/quagga.pre-install b/main/quagga/quagga.pre-install
index c0fe3c8c5..f8340fa26 100644
--- a/main/quagga/quagga.pre-install
+++ b/main/quagga/quagga.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S quagga 2>/dev/null
-adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga quagga 2>/dev/null
+adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga -g quagga quagga 2>/dev/null
 exit 0
 
diff --git a/main/quassel/quassel-core.pre-install b/main/quassel/quassel-core.pre-install
index 66572a16d..01ec63dd7 100644
--- a/main/quassel/quassel-core.pre-install
+++ b/main/quassel/quassel-core.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/quassel -s /sbin/nologin -D quassel 2>/dev/null
+adduser -S -h /var/lib/quassel -s /sbin/nologin -D -g quassel quassel 2>/dev/null
 addgroup -S quassel 2>/dev/null
 addgroup quassel quassel
 
diff --git a/main/redis/redis.pre-install b/main/redis/redis.pre-install
index 479434e50..2a5993426 100644
--- a/main/redis/redis.pre-install
+++ b/main/redis/redis.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S redis 2>/dev/null
-adduser -S -H -h /var/lib/redis -s /bin/false -D -G redis redis 2>/dev/null
+adduser -S -H -h /var/lib/redis -s /bin/false -D -G redis -g redis redis 2>/dev/null
 exit 0
diff --git a/main/rpcbind/rpcbind.pre-install b/main/rpcbind/rpcbind.pre-install
index 8db312862..51fae4540 100644
--- a/main/rpcbind/rpcbind.pre-install
+++ b/main/rpcbind/rpcbind.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S rpc 2>/dev/null
-adduser -S -h /var/lib/rpcbind -s /sbin/nologin -D -G rpc rpc 2>/dev/null
+adduser -S -h /var/lib/rpcbind -s /sbin/nologin -D -G rpc -g rpc rpc 2>/dev/null
 exit 0
diff --git a/main/rtnppd/rtnppd.pre-install b/main/rtnppd/rtnppd.pre-install
index ec2c92263..faf043122 100644
--- a/main/rtnppd/rtnppd.pre-install
+++ b/main/rtnppd/rtnppd.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S rtnppd 2>/dev/null
-adduser -S -G rtnppd -H -h /var/run/rtnppd -s /sbin/nologin rtnppd 2>/dev/null
+adduser -S -G rtnppd -H -h /var/run/rtnppd -s /sbin/nologin -g rtnppd rtnppd 2>/dev/null
 exit 0
diff --git a/main/rtpproxy/rtpproxy.pre-install b/main/rtpproxy/rtpproxy.pre-install
index d4ca59396..cbf1e527c 100644
--- a/main/rtpproxy/rtpproxy.pre-install
+++ b/main/rtpproxy/rtpproxy.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S rtpproxy 2>/dev/null
-adduser -S -G rtpproxy -H -h /usr/share/rtpproxy -s /sbin/nologin rtpproxy 2>/dev/null
+adduser -S -G rtpproxy -H -h /usr/share/rtpproxy -s /sbin/nologin -g rtpproxy rtpproxy 2>/dev/null
 exit 0
diff --git a/main/sems/sems.pre-install b/main/sems/sems.pre-install
index 6241566f3..b3b5c7802 100644
--- a/main/sems/sems.pre-install
+++ b/main/sems/sems.pre-install
@@ -4,7 +4,7 @@ if ! getent group sems >/dev/null; then
 	addgroup -S sems
 fi
 if ! getent passwd sems >/dev/null; then
-	adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems sems 2>/dev/null
+	adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems -g sems sems 2>/dev/null
 fi
 
 exit 0
diff --git a/main/sircbot/sircbot.pre-install b/main/sircbot/sircbot.pre-install
index 453ba5dd1..8bfedcc9c 100644
--- a/main/sircbot/sircbot.pre-install
+++ b/main/sircbot/sircbot.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S sircbot 2>/dev/null
-adduser -S -h /var/run/sircbot -G sircbot -D sircbot 2>/dev/null
+adduser -S -h /var/run/sircbot -G sircbot -D -g sircbot sircbot 2>/dev/null
 exit 0
diff --git a/main/smokeping/smokeping.pre-install b/main/smokeping/smokeping.pre-install
index 893414898..3158cc40a 100644
--- a/main/smokeping/smokeping.pre-install
+++ b/main/smokeping/smokeping.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S smokeping 2>/dev/null
-adduser -S -h /var/lib/smokeping -D -G smokeping smokeping 2>/dev/null
+adduser -S -h /var/lib/smokeping -D -G smokeping -g smokeping smokeping 2>/dev/null
 exit 0
diff --git a/main/snmptt/snmptt.pre-install b/main/snmptt/snmptt.pre-install
index 6619337ad..efc8a6e05 100644
--- a/main/snmptt/snmptt.pre-install
+++ b/main/snmptt/snmptt.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -h /var/spool/snmptt -s /sbin/nologin -D snmptt &>/dev/null
+adduser -S -h /var/spool/snmptt -s /sbin/nologin -D -g snmptt snmptt &>/dev/null
 exit 0
diff --git a/main/snort/snort.pre-install b/main/snort/snort.pre-install
index c8bf70618..47608ed97 100644
--- a/main/snort/snort.pre-install
+++ b/main/snort/snort.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -h /var/log/snort -s /sbin/nologin -D snort 2>/dev/null
+adduser -S -h /var/log/snort -s /sbin/nologin -D -g snort snort 2>/dev/null
 exit 0
diff --git a/main/squid/squid.pre-install b/main/squid/squid.pre-install
index b51ade156..3ac1f9fa1 100644
--- a/main/squid/squid.pre-install
+++ b/main/squid/squid.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -D squid -H /var/cache/squid  2>/dev/null
+adduser -S -D -g squid squid -H /var/cache/squid  2>/dev/null
 addgroup -S winbind 2>/dev/null
 addgroup squid winbind
 exit 0
diff --git a/main/squid/squid.pre-upgrade b/main/squid/squid.pre-upgrade
index b51ade156..3ac1f9fa1 100644
--- a/main/squid/squid.pre-upgrade
+++ b/main/squid/squid.pre-upgrade
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -D squid -H /var/cache/squid  2>/dev/null
+adduser -S -D -g squid squid -H /var/cache/squid  2>/dev/null
 addgroup -S winbind 2>/dev/null
 addgroup squid winbind
 exit 0
diff --git a/main/strongswan/strongswan.pre-install b/main/strongswan/strongswan.pre-install
index e1fa31974..12371d119 100644
--- a/main/strongswan/strongswan.pre-install
+++ b/main/strongswan/strongswan.pre-install
@@ -4,7 +4,7 @@ if ! getent group ipsec >/dev/null; then
 	addgroup -S ipsec
 fi
 if ! getent passwd ipsec >/dev/null; then
-	adduser -S -H -h /var/empty -s /sbin/nologin -D -G ipsec ipsec 2>/dev/null
+	adduser -S -H -h /var/empty -s /sbin/nologin -D -G ipsec -g ipsec ipsec 2>/dev/null
 fi
 
 exit 0
diff --git a/main/subversion/subversion.pre-install b/main/subversion/subversion.pre-install
index ddec16ce8..31090069b 100644
--- a/main/subversion/subversion.pre-install
+++ b/main/subversion/subversion.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S svnusers 2>/dev/null
-adduser -S svn -D -h /var/svn -G svnusers 2>/dev/null
+adduser -S -g svn svn -D -h /var/svn -G svnusers 2>/dev/null
 exit 0
 
diff --git a/main/trac/trac.pre-install b/main/trac/trac.pre-install
index f39f2b213..0fa8f02aa 100644
--- a/main/trac/trac.pre-install
+++ b/main/trac/trac.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S tracd 2>/dev/null
-adduser -S -s /sbin/nologin -G tracd -D -H tracd 2>/dev/null
+adduser -S -s /sbin/nologin -G tracd -D -H -g tracd tracd 2>/dev/null
 exit 0
diff --git a/main/transmission/transmission-daemon.pre-install b/main/transmission/transmission-daemon.pre-install
index 2f9a398a0..9ccac8cdc 100644
--- a/main/transmission/transmission-daemon.pre-install
+++ b/main/transmission/transmission-daemon.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/transmission -s /sbin/nologin -D transmission 2>/dev/null
+adduser -S -h /var/lib/transmission -s /sbin/nologin -D -g transmission transmission 2>/dev/null
 
 exit 0
diff --git a/main/umurmur/umurmur.post-install b/main/umurmur/umurmur.post-install
index 9d5f40834..d9a350a78 100755
--- a/main/umurmur/umurmur.post-install
+++ b/main/umurmur/umurmur.post-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S umurmur &>/dev/null
-adduser -S -s /bin/false -G umurmur -h /var/run/umurmurd -D umurmur &>/dev/null
+adduser -S -s /bin/false -G umurmur -h /var/run/umurmurd -D -g umurmur umurmur &>/dev/null
 exit 0
diff --git a/main/uvncrepeater/uvncrepeater.pre-install b/main/uvncrepeater/uvncrepeater.pre-install
index a1126c617..0c856f813 100644
--- a/main/uvncrepeater/uvncrepeater.pre-install
+++ b/main/uvncrepeater/uvncrepeater.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -D uvncrep 2>/dev/null
+adduser -S -D -g uvncrep uvncrep 2>/dev/null
 exit 0
 
diff --git a/main/varnish/varnish.pre-install b/main/varnish/varnish.pre-install
index 930d46b99..74ccfd142 100644
--- a/main/varnish/varnish.pre-install
+++ b/main/varnish/varnish.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S varnish 2>/dev/null
-adduser -S -H -h /var/lib/varnish -s /sbin/nologin -D -G varnish varnish 2>/dev/null
+adduser -S -H -h /var/lib/varnish -s /sbin/nologin -D -G varnish -g varnish varnish 2>/dev/null
 exit 0
diff --git a/main/vde2/vde2.pre-install b/main/vde2/vde2.pre-install
index bb5037c2a..0e4235069 100644
--- a/main/vde2/vde2.pre-install
+++ b/main/vde2/vde2.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S vde2-net 2>/dev/null
-adduser -S -h /var/run/vde2 -s /sbin/nologin -G vde2-net -D -H vde2-net 2>/dev/null
+adduser -S -h /var/run/vde2 -s /sbin/nologin -G vde2-net -D -H -g vde2-net vde2-net 2>/dev/null
 
 exit 0
diff --git a/main/vlc/vlc-daemon.pre-install b/main/vlc/vlc-daemon.pre-install
index 72ee1b7ff..33f99df87 100644
--- a/main/vlc/vlc-daemon.pre-install
+++ b/main/vlc/vlc-daemon.pre-install
@@ -4,7 +4,7 @@ groups="vlc audio video"
 for group in $groups; do
 	addgroup -S $group 2>/dev/null
 done
-adduser -S -h /home/vlc -s /bin/sh -G vlc -D vlc 2>/dev/null
+adduser -S -h /home/vlc -s /bin/sh -G vlc -D -g vlc vlc 2>/dev/null
 
 # make sure vlc are in all groups
 for group in $groups; do
diff --git a/main/vsftpd/vsftpd.pre-install b/main/vsftpd/vsftpd.pre-install
index 200d233e8..0ed59d906 100755
--- a/main/vsftpd/vsftpd.pre-install
+++ b/main/vsftpd/vsftpd.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 addgroup -S ftp &>/dev/null
 addgroup vsftp ftp &>/dev/null
-adduser -S -h /var/lib/ftp -s /sbin/nologin -G ftp vsftp &>/dev/null
+adduser -S -h /var/lib/ftp -s /sbin/nologin -G ftp -g vsftp vsftp &>/dev/null
 exit 0
diff --git a/main/ympd/ympd.pre-install b/main/ympd/ympd.pre-install
index 1bbd0459a..369f25d94 100644
--- a/main/ympd/ympd.pre-install
+++ b/main/ympd/ympd.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -H -D -s /sbin/nologin -G audio ympd 2>/dev/null
+adduser -S -H -D -s /sbin/nologin -G audio -g ympd ympd 2>/dev/null
 exit 0
diff --git a/main/zabbix/zabbix-agent.pre-install b/main/zabbix/zabbix-agent.pre-install
index 91ea88c23..a63d884e0 100644
--- a/main/zabbix/zabbix-agent.pre-install
+++ b/main/zabbix/zabbix-agent.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S zabbix 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix zabbix 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null
 addgroup -g 30 zabbix 2>/dev/null
 exit 0
diff --git a/main/zabbix/zabbix.pre-install b/main/zabbix/zabbix.pre-install
index 19d6469cc..30851f153 100644
--- a/main/zabbix/zabbix.pre-install
+++ b/main/zabbix/zabbix.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S zabbix 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix zabbix 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null
 exit 0
diff --git a/main/znc/znc.pre-install b/main/znc/znc.pre-install
index ad5aed93c..c0e1fa5f6 100644
--- a/main/znc/znc.pre-install
+++ b/main/znc/znc.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -H -D -s /sbin/nologin znc 2>/dev/null
+adduser -S -H -D -s /sbin/nologin -g znc znc 2>/dev/null
 exit 0