diff --git a/community/caddy/caddy.pre-install b/community/caddy/caddy.pre-install
index dc78350388668eeee53fa6513485cd4293104164..ccb4f07f8fa2bf8120c1da5d03ad56b5160e0d47 100644
--- a/community/caddy/caddy.pre-install
+++ b/community/caddy/caddy.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/caddy -D -s /sbin/nologin -g caddy caddy 2>/dev/null
+adduser -S -D -h /var/lib/caddy -s /sbin/nologin -g caddy caddy 2>/dev/null
 adduser caddy www-data 2>/dev/null
 
 exit 0
diff --git a/community/docker-registry/docker-registry.pre-install b/community/docker-registry/docker-registry.pre-install
index 5d1fbbbed3b1f9bd96f0c32ce1f54f2647112f8c..8c1c98636f67bc3004a5e565738ebfa0b8df5f53 100644
--- a/community/docker-registry/docker-registry.pre-install
+++ b/community/docker-registry/docker-registry.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S docker-registry 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G docker-registry -g docker-registry docker-registry 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G docker-registry -g docker-registry docker-registry 2>/dev/null
 
 exit 0
diff --git a/community/domoticz/domoticz.pre-install b/community/domoticz/domoticz.pre-install
index 5162f88385633ec6df364f4275f64cb599bfd2bf..227206764fb466a2a4f3de0841ecef5c4941c089 100644
--- a/community/domoticz/domoticz.pre-install
+++ b/community/domoticz/domoticz.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/domoticz -D -s /sbin/nologin -g domoticz domoticz 2>/dev/null
+adduser -S -D -h /var/lib/domoticz -s /sbin/nologin -g domoticz domoticz 2>/dev/null
 
 exit 0
diff --git a/community/icinga2/icinga2.pre-install b/community/icinga2/icinga2.pre-install
index 7b0002ce346236b29c9ca4e480d0020ad8d06406..ccb5265c7f1b63d73fc72160033f647155792505 100644
--- a/community/icinga2/icinga2.pre-install
+++ b/community/icinga2/icinga2.pre-install
@@ -2,7 +2,7 @@
 
 addgroup -S icinga 2>/dev/null
 addgroup -S icingacmd 2>/dev/null
-adduser -S -G icinga -H -h /var/spool/icinga2 -s /sbin/nologin -D -g icinga icinga 2>/dev/null
+adduser -S -D -H -h /var/spool/icinga2 -s /sbin/nologin -G icinga -g icinga icinga 2>/dev/null
 adduser icinga icingacmd 2>/dev/null
 
 exit 0
diff --git a/community/minetest/minetest-server.pre-install b/community/minetest/minetest-server.pre-install
index da9a0259594d7eec0c44d6a07c2301122f6aba27..ec187b9ce6e54dc77871e41f85cce928d1675e91 100644
--- a/community/minetest/minetest-server.pre-install
+++ b/community/minetest/minetest-server.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -s /sbin/nologin -D -h /var/lib/minetest -g minetest minetest games 2>/dev/null
+adduser -S -D -h /var/lib/minetest -s /sbin/nologin -G games -g minetest minetest 2>/dev/null
 
 exit 0
diff --git a/community/oscam/oscam.pre-install b/community/oscam/oscam.pre-install
index 4e0c49a166b99503714742e169345bef804366b2..a9982c724b4930ef43453f7c5010895f941be279 100644
--- a/community/oscam/oscam.pre-install
+++ b/community/oscam/oscam.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -H -D -s /sbin/nologin -g oscam oscam 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -g oscam oscam 2>/dev/null
 addgroup oscam usb 2>/dev/null
 
 exit 0
diff --git a/community/redmine/redmine.pre-install b/community/redmine/redmine.pre-install
index 072bd1d15528570e4b39ca5b10b898b25564c473..8957913cfc5effba163dea021f4a1bc421add4ce 100644
--- a/community/redmine/redmine.pre-install
+++ b/community/redmine/redmine.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -h /usr/share/webapps/redmine -s /bin/sh -D -g redmine redmine 2>/dev/null
+adduser -S -D -H -h /usr/share/webapps/redmine -s /bin/sh -g redmine redmine 2>/dev/null
 addgroup redmine www-data 2>/dev/null
 
 exit 0
diff --git a/community/seafile/seafile-server.pre-install b/community/seafile/seafile-server.pre-install
index b5c1b4f64e17d19fa8d89f8f61201e9d4951c3d0..7e3df0b5ef9febbb04bf553f905cf02c73baa0d4 100644
--- a/community/seafile/seafile-server.pre-install
+++ b/community/seafile/seafile-server.pre-install
@@ -3,6 +3,6 @@
 SEAFILE_HOME=/var/lib/seafile
 
 addgroup -S -g 800 seafile 2>/dev/null
-adduser -S -h $SEAFILE_HOME -s /bin/sh -G seafile -g seafile -u 800 -D seafile 2>/dev/null
+adduser -S -u 800 -D -h $SEAFILE_HOME -s /bin/sh -G seafile -g seafile seafile 2>/dev/null
 
 exit 0
diff --git a/community/smstools/smstools.pre-install b/community/smstools/smstools.pre-install
index 0a5106f6e58e8a45cf0cfe342cfdd11cc72b5cec..104cf129c16190a1614b136109d5bfd7ec405c6a 100755
--- a/community/smstools/smstools.pre-install
+++ b/community/smstools/smstools.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S smsd 2>/dev/null
-adduser -S -h /var/spool/sms -s /sbin/nologin -G smsd -D -g smsd smsd 2>/dev/null
+adduser -S -D -h /var/spool/sms -s /sbin/nologin -G smsd -g smsd smsd 2>/dev/null
 adduser -G uucp smsd 2>/dev/null
 
 exit 0
diff --git a/community/sniproxy/sniproxy.pre-install b/community/sniproxy/sniproxy.pre-install
index aa2f7dfca5a39f818070717760d812959e7c3c63..e0e250af6d0e664b14e86a6415dea1a7903fa6f6 100644
--- a/community/sniproxy/sniproxy.pre-install
+++ b/community/sniproxy/sniproxy.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S sniproxy 2>/dev/null
-adduser -S -h /var/log/sniproxy -s /bin/false -D -g sniproxy sniproxy 2>/dev/null
+adduser -S -D -h /var/log/sniproxy -s /bin/false -g sniproxy sniproxy 2>/dev/null
 
 exit 0
diff --git a/community/syncthing/syncthing.pre-install b/community/syncthing/syncthing.pre-install
index ab337cca31e362e8979ab09f549766a8c99ae46f..a2ee46c83130721d173ab2e7c3269780d9dcc202 100644
--- a/community/syncthing/syncthing.pre-install
+++ b/community/syncthing/syncthing.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /var/lib/syncthing -s /sbin/nologin -D -g syncthing syncthing 2>/dev/null
+adduser -S -D -H -h /var/lib/syncthing -s /sbin/nologin -g syncthing syncthing 2>/dev/null
 
 exit 0
diff --git a/community/tvheadend/tvheadend.pre-install b/community/tvheadend/tvheadend.pre-install
index 6b64423424c8ee5b64ac3c6d8b1012ef894b9c1c..3e270cb7f2014f6f37869e27f67eb21e2ad504fa 100644
--- a/community/tvheadend/tvheadend.pre-install
+++ b/community/tvheadend/tvheadend.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -G video -s /sbin/nologin -H -h /usr/share/tvheadend -g tvheadend tvheadend 2>/dev/null
+adduser -S -H -h /usr/share/tvheadend -s /sbin/nologin -G video -g tvheadend tvheadend 2>/dev/null
 addgroup tvheadend usb 2>/dev/null
 
 exit 0
diff --git a/main/amavisd-new/amavisd-new.pre-install b/main/amavisd-new/amavisd-new.pre-install
index 5223f9fb2068c2ed81fc5c25fcd0e0e24f813465..e67268291439c1e45eef2d541998e6ada10a4cd6 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 -g amavis amavis 2>/dev/null
+adduser -S -D -h /var/amavis -s /sbin/nologin -G amavis -g amavis amavis 2>/dev/null
 
 exit 0
diff --git a/main/apache2/apache2.pre-install b/main/apache2/apache2.pre-install
index f142d894e6a61dc125fa0c019c069801c4b3247f..703681e013487e1d8e99cae70753a0d831d50d24 100644
--- a/main/apache2/apache2.pre-install
+++ b/main/apache2/apache2.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -h /var/www -s /sbin/nologin -D -g apache apache 2>/dev/null
+adduser -S -D -H -h /var/www -s /sbin/nologin -g apache apache 2>/dev/null
 addgroup apache www-data 2>/dev/null
 
 exit 0
diff --git a/main/arpwatch/arpwatch.pre-install b/main/arpwatch/arpwatch.pre-install
index 56fdfe34e037a836fa807985c96fd69745cb1be3..a8d1e31bd926b083ad37a783d89dd5238202254c 100644
--- a/main/arpwatch/arpwatch.pre-install
+++ b/main/arpwatch/arpwatch.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -s /sbin/nologin -D -g arpwatch arpwatch 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -g arpwatch arpwatch 2>/dev/null
 
 exit 0
diff --git a/main/asterisk/asterisk.pre-install b/main/asterisk/asterisk.pre-install
index df228c28b6f1f1a1a2870c6aa43348bda545f21b..5396c69468b27f7c50363a83a87effa09e866829 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 -g asterisk asterisk 2>/dev/null
+adduser -S -D -h /var/lib/asterisk -s /sbin/nologin -g asterisk asterisk 2>/dev/null
 addgroup -S dialout 2>/dev/null
 addgroup asterisk dialout 2>/dev/null
 
diff --git a/main/asterisk/asterisk.pre-upgrade b/main/asterisk/asterisk.pre-upgrade
index 02414e674baef0e7db19f7003763cc4406ca51c0..0b09a3fa1b289a4d8e4fe18f68d42fff6eef2255 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 -g asterisk asterisk 2>/dev/null
+adduser -S -D -h /var/lib/asterisk -s /bin/false -g asterisk asterisk 2>/dev/null
 addgroup -S dialout 2>/dev/null
 addgroup asterisk dialout 2>/dev/null
 
diff --git a/main/atheme-iris/atheme-iris.pre-install b/main/atheme-iris/atheme-iris.pre-install
index ef8ea56f517ab41cdd41eb90cd2f83b3d56161aa..490ba08f74fa70f6ed1ee5a984247fd022a9dab9 100644
--- a/main/atheme-iris/atheme-iris.pre-install
+++ b/main/atheme-iris/atheme-iris.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /usr/share/webapps/atheme-iris -g iris -D -s /sbin/nologin iris >/dev/null
+adduser -S -D -H -h /usr/share/webapps/atheme-iris -s /sbin/nologin -g iris iris >/dev/null
 
 exit 0
diff --git a/main/avahi/avahi.pre-install b/main/avahi/avahi.pre-install
index 33802cafbe7768da9df5548b7e28deb6da81dc12..89b2fd4ab46233ee583d62855676c916913b99ac 100644
--- a/main/avahi/avahi.pre-install
+++ b/main/avahi/avahi.pre-install
@@ -2,12 +2,11 @@
 
 addgroup -S -g 28 netdev 2>/dev/null
 addgroup -S -g 86 avahi 2>/dev/null
-adduser -S -u 86 \
+adduser -S -u 86 -D -H \
 	-h /var/run/avahi-daemon \
 	-s /sbin/nologin \
-	-D -H \
-	-g "Avahi System User" \
 	-G avahi \
+	-g "Avahi System User" \
 	avahi 2>/dev/null
 
 exit 0
diff --git a/main/backuppc/backuppc.pre-install b/main/backuppc/backuppc.pre-install
index 2ed220e00c8dde4db01e44998fd45d015c907f50..eea66968c1a88443ed15d31ea3c87f62f35505e3 100644
--- a/main/backuppc/backuppc.pre-install
+++ b/main/backuppc/backuppc.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S backuppc 2>/dev/null
-adduser -S -h /var/lib/BackupPC -s /bin/sh -D -H -G backuppc -g "BackupPC user" backuppc 2>/dev/null
+adduser -S -D -H -h /var/lib/BackupPC -s /bin/sh -G backuppc -g "BackupPC user" backuppc 2>/dev/null
 
 exit 0
diff --git a/main/bacula-client/bacula-client.pre-install b/main/bacula-client/bacula-client.pre-install
index 363af9d96484af02db79f218517228d280c6f202..4116667f1042ff6194d4e21fae335df3da8828da 100644
--- a/main/bacula-client/bacula-client.pre-install
+++ b/main/bacula-client/bacula-client.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S bacula 2>/dev/null
-adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D -g bacula bacula 2>/dev/null
+adduser -S -D -h /var/lib/bacula/ -s /sbin/nologin -G bacula -g bacula bacula 2>/dev/null
 
 exit 0
diff --git a/main/bacula/bacula.pre-install b/main/bacula/bacula.pre-install
index 363af9d96484af02db79f218517228d280c6f202..4116667f1042ff6194d4e21fae335df3da8828da 100644
--- a/main/bacula/bacula.pre-install
+++ b/main/bacula/bacula.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S bacula 2>/dev/null
-adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D -g bacula bacula 2>/dev/null
+adduser -S -D -h /var/lib/bacula/ -s /sbin/nologin -G bacula -g bacula bacula 2>/dev/null
 
 exit 0
diff --git a/main/bind/bind.pre-install b/main/bind/bind.pre-install
index 49e398b89f470c933127d0fa68470f5596164730..430f2b8b0b283405051859c4536e2fe564dd8808 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 -g named named 2>/dev/null
+adduser -S -D -h /etc/bind -s /sbin/nologin -G named -g named named 2>/dev/null
 
 exit 0
diff --git a/main/charybdis/charybdis.pre-install b/main/charybdis/charybdis.pre-install
index 2dab19bc87c5e88f97344d42b3f8540806e1c983..8675cb94138eee0167daa6389f7ca7fb2b53d8d9 100644
--- a/main/charybdis/charybdis.pre-install
+++ b/main/charybdis/charybdis.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/run/charybdis -s /sbin/nologin -D -g ircd ircd 2>/dev/null
+adduser -S -D -h /var/run/charybdis -s /sbin/nologin -g ircd ircd 2>/dev/null
 
 exit 0
diff --git a/main/chrony/chrony.pre-install b/main/chrony/chrony.pre-install
index 32b8fe3c3142c5ea211244037ea730a7a29c25e6..897fb74ccaf5aa4b5a1ff6a65176f61372b51df2 100644
--- a/main/chrony/chrony.pre-install
+++ b/main/chrony/chrony.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S chrony 2>/dev/null
-adduser -S -G chrony -h /var/log/chrony -s /sbin/nologin -D -g chrony chrony 2>/dev/null
+adduser -S -D -h /var/log/chrony -s /sbin/nologin -G chrony -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 0442c39fa24d03026c7c45b6f14d6657831798d2..a5da82903190861de020418e4f405398f4a0d95d 100644
--- a/main/clamav/clamav-daemon.pre-install
+++ b/main/clamav/clamav-daemon.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S clamav 2>/dev/null
-adduser -S -h /var/lib/clamav -H -s /sbin/nologin -D -G clamav -g clamav clamav 2>/dev/null
+adduser -S -D -H -h /var/lib/clamav -s /sbin/nologin -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 b442a43cfd2c36957d7fd970c5764f22c0c3c64e..d1e52fb01603306406151a6c581e5e13a34cc0ae 100644
--- a/main/clamav/clamav-db.pre-install
+++ b/main/clamav/clamav-db.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -s /sbin/nologin -D -g clamav clamav 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -g clamav clamav 2>/dev/null
 
 exit 0
diff --git a/main/clamav/freshclam.pre-install b/main/clamav/freshclam.pre-install
index 0442c39fa24d03026c7c45b6f14d6657831798d2..a5da82903190861de020418e4f405398f4a0d95d 100644
--- a/main/clamav/freshclam.pre-install
+++ b/main/clamav/freshclam.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S clamav 2>/dev/null
-adduser -S -h /var/lib/clamav -H -s /sbin/nologin -D -G clamav -g clamav clamav 2>/dev/null
+adduser -S -D -H -h /var/lib/clamav -s /sbin/nologin -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 b442a43cfd2c36957d7fd970c5764f22c0c3c64e..d1e52fb01603306406151a6c581e5e13a34cc0ae 100644
--- a/main/clamsmtp/clamsmtp.pre-install
+++ b/main/clamsmtp/clamsmtp.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -s /sbin/nologin -D -g clamav clamav 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -g clamav clamav 2>/dev/null
 
 exit 0
diff --git a/main/clamsmtp/clamsmtp.pre-upgrade b/main/clamsmtp/clamsmtp.pre-upgrade
index a58c16510004863fd903bfd320d1312b4b2bb773..959576dd40669f900a1d99aa49ed26148d090344 100644
--- a/main/clamsmtp/clamsmtp.pre-upgrade
+++ b/main/clamsmtp/clamsmtp.pre-upgrade
@@ -10,6 +10,6 @@ if [ -f "$old" ] && [ ! -f "$new" ]; then
 	echo " *"
 fi
 
-adduser -S -H -s /bin/false -D -g clamav clamav 2>/dev/null
+adduser -S -D -H -s /bin/false -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 65624f364c6f1be7ab2c180b6a530adb46beeef7..bf6ea4c1c1b35b1dfed755a7de833d38faad6095 100644
--- a/main/coova-chilli/coova-chilli.pre-install
+++ b/main/coova-chilli/coova-chilli.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -s /sbin/nologin -D -g chilli chilli 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -g chilli chilli 2>/dev/null
 
 exit 0
diff --git a/main/cvechecker/cvechecker.pre-install b/main/cvechecker/cvechecker.pre-install
index 7cc6f41899d2ea80b9a9540ecff9e874c9122204..2e60d1cbb04a7566be3bf614db73190c8de0e194 100644
--- a/main/cvechecker/cvechecker.pre-install
+++ b/main/cvechecker/cvechecker.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S cvechecker 2>/dev/null
-adduser -S -g cvechecker cvechecker -h /var/cvechecker -DG cvechecker 2>/dev/null
+adduser -S -D -h /var/cvechecker -G cvechecker -g cvechecker cvechecker 2>/dev/null
 
 exit 0
diff --git a/main/darkhttpd/darkhttpd.pre-install b/main/darkhttpd/darkhttpd.pre-install
index b189233ae11c2a90451229bd55b7ababd3893e6f..bd73148097dfb0ccb4efebe0025f35d0799ff5f1 100644
--- a/main/darkhttpd/darkhttpd.pre-install
+++ b/main/darkhttpd/darkhttpd.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 -g darkhttpd \
+adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin -g darkhttpd \
 	darkhttpd 2>/dev/null
 addgroup darkhttpd www-data 2>/dev/null
 
diff --git a/main/dbus/dbus.pre-install b/main/dbus/dbus.pre-install
index c736ea0b91accab72fb1b1a9d6d67ec40d91614f..2623d00c5651676d6cc537f47b0c9a9d13d13c84 100644
--- a/main/dbus/dbus.pre-install
+++ b/main/dbus/dbus.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S messagebus 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -g messagebus messagebus -G messagebus 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G messagebus -g messagebus messagebus 2>/dev/null
 
 exit 0
diff --git a/main/dhcp/dhcp.pre-install b/main/dhcp/dhcp.pre-install
index 83ba7f045e30772406c337097879d1749a60d1ac..2e0b83989ba77405819fca33be291f503950a517 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 -g dhcp dhcp 2>/dev/null
+adduser -S -D -h /var/lib/dhcp -s /sbin/nologin -g dhcp dhcp 2>/dev/null
 
 exit 0
diff --git a/main/distcc/distcc.pre-install b/main/distcc/distcc.pre-install
index 15d591dd1d2ae22dca042d0ad9f5c468c23e060e..ef4cf195d1b3084e3ebfeb1ae86463ac6f6137aa 100644
--- a/main/distcc/distcc.pre-install
+++ b/main/distcc/distcc.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S distcc 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -G distcc -D -g distcc distcc 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G distcc -g distcc distcc 2>/dev/null
 
 exit 0
diff --git a/main/djbdns/dnscache.pre-install b/main/djbdns/dnscache.pre-install
index 1b58fffa1cf99fed571ac114303b030d73d93a48..664732ca54e1bf69e718e9d7c687d1f522062346 100644
--- a/main/djbdns/dnscache.pre-install
+++ b/main/djbdns/dnscache.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /etc/dnscache -g dnscache -s /sbin/nologin -H -D dnscache 2>/dev/null
+adduser -S -D -H -h /etc/dnscache -g dnscache -s /sbin/nologin dnscache 2>/dev/null
 
 exit 0
diff --git a/main/djbdns/tinydns.pre-install b/main/djbdns/tinydns.pre-install
index 094f0d8fc29370f6335024c08b080eadbfd71d8e..85ba7e7e205e4410ef21ce7d3e7974f95079b2b4 100644
--- a/main/djbdns/tinydns.pre-install
+++ b/main/djbdns/tinydns.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /etc/tinydns -g tinydns -s /sbin/nologin -H -D tinydns 2>/dev/null
+adduser -S -D -H -h /etc/tinydns -s /sbin/nologin -g tinydns tinydns 2>/dev/null
 
 exit 0
diff --git a/main/dnsmasq/dnsmasq.pre-install b/main/dnsmasq/dnsmasq.pre-install
index 1263e54e0f92b59464b463e572a646aed6d99baa..708c15b30cf9135ea87ef3b4a03393406bfac9ce 100644
--- a/main/dnsmasq/dnsmasq.pre-install
+++ b/main/dnsmasq/dnsmasq.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S dnsmasq 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -G dnsmasq -D -g dnsmasq dnsmasq 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G dnsmasq -g dnsmasq dnsmasq 2>/dev/null
 
 exit 0
diff --git a/main/dovecot/dovecot.pre-install b/main/dovecot/dovecot.pre-install
index d3c346867e2d426d76d3ab2063d26b09fcfd866a..e19b1138a2b6d04d8bfbe245e2e2e6b6745cd826 100644
--- a/main/dovecot/dovecot.pre-install
+++ b/main/dovecot/dovecot.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-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
+adduser -S -u 90 -D -H -h /dev/null -s /sbin/nologin -g dovecot dovecot 2>/dev/null
+adduser -S -u 91 -D -H -h /dev/null -s /sbin/nologin -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 b6b7e222132ce7c83e967ccbbcec3604489ea099..11b4c57b27b57640c16ee2f9695703486fc44b60 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 -g ipupdate ipupdate 2>/dev/null
+adduser -S -D -h /var/lib/ez-ipupdate -s /sbin/nologin -g ipupdate ipupdate 2>/dev/null
 
 exit 0
diff --git a/main/fetchmail/fetchmail.pre-install b/main/fetchmail/fetchmail.pre-install
index d9c1aed834c809d59674f566897059404952b27c..ed3d409b5ad897eafae86fd7ddb7f7ae2bf44c65 100644
--- a/main/fetchmail/fetchmail.pre-install
+++ b/main/fetchmail/fetchmail.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /var/lib/fetchmail -s /sbin/nologin -D -g fetchmail fetchmail 2>/dev/null
+adduser -S -D -H -h /var/lib/fetchmail -s /sbin/nologin -g fetchmail fetchmail 2>/dev/null
 
 exit 0
diff --git a/main/freeradius/freeradius.pre-install b/main/freeradius/freeradius.pre-install
index 8b0903272097544986c442fbf1ecf165bb5b0e72..b5a11be49eb1197b9603ccb098af39ad97ca1fc1 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 -g radius radius 2>/dev/null
+adduser -S -D -h /var/log/radius -s /sbin/nologin -G radius -g radius radius 2>/dev/null
 
 exit 0
diff --git a/main/freeswitch/freeswitch.pre-install b/main/freeswitch/freeswitch.pre-install
index f175cd362a76ef6baf2d41134fcfecc249b19c95..6f31b67f619532996bf3b5de99b81d19e083a003 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 -g freeswitch freeswitch 2>/dev/null
+adduser -S -D -H -h /var/run/freeswitch -s /sbin/nologin -g freeswitch freeswitch 2>/dev/null
 
 exit 0
diff --git a/main/gdnsd/gdnsd.pre-install b/main/gdnsd/gdnsd.pre-install
index 8e8af592f48cca8a4d080b5e13996e07beb64205..0bd9cb7f664bb6866e1371bd46594ccce17c96f8 100644
--- a/main/gdnsd/gdnsd.pre-install
+++ b/main/gdnsd/gdnsd.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S gdnsd 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd -g gdnsd gdnsd 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -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 80a3a714c3503ab9ca3566a41260b0949c4e26d3..506ef1d8f1267214897900c5d939be2bcd326ac9 100644
--- a/main/gitolite/gitolite.pre-install
+++ b/main/gitolite/gitolite.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /var/lib/git -s /bin/sh -D -g git git 2>/dev/null
+adduser -S -D -H -h /var/lib/git -s /bin/sh -g git git 2>/dev/null
 
 exit 0
diff --git a/main/gnats/gnats.pre-install b/main/gnats/gnats.pre-install
index a66e2d903dbf8b49f6b731491557dbf74670ebe5..e3a4de00829dfed3baa99ef0b46b35fe40b57fa7 100644
--- a/main/gnats/gnats.pre-install
+++ b/main/gnats/gnats.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/gnatsdb -D -g gnats gnats 2>/dev/null
+adduser -S -D -h /var/lib/gnatsdb -g gnats gnats 2>/dev/null
 
 exit 0
diff --git a/main/gross/gross.pre-install b/main/gross/gross.pre-install
index 22fecf465e3ada175492f64a43ba468060012af1..078372da720d6e244b71a7da58d1e642f08e53b3 100644
--- a/main/gross/gross.pre-install
+++ b/main/gross/gross.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -s /sbin/nologin -D -g gross gross 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -g gross gross 2>/dev/null
 
 exit 0
diff --git a/main/haproxy/haproxy.pre-install b/main/haproxy/haproxy.pre-install
index 162855ab33c47f41d5ff19034815628a78c41aca..85cefc98146f1e5c6ef32e3f9d42ffd1aaaf21f9 100644
--- a/main/haproxy/haproxy.pre-install
+++ b/main/haproxy/haproxy.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S haproxy 2>/dev/null
-adduser -S -H -h /var/lib/haproxy -s /bin/false -D \
+adduser -S -D -H -h /var/lib/haproxy -s /bin/false \
 	-G haproxy -g haproxy haproxy 2>/dev/null
 
 # move config to new location
diff --git a/main/haproxy/haproxy.pre-upgrade b/main/haproxy/haproxy.pre-upgrade
index 162855ab33c47f41d5ff19034815628a78c41aca..85cefc98146f1e5c6ef32e3f9d42ffd1aaaf21f9 100644
--- a/main/haproxy/haproxy.pre-upgrade
+++ b/main/haproxy/haproxy.pre-upgrade
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S haproxy 2>/dev/null
-adduser -S -H -h /var/lib/haproxy -s /bin/false -D \
+adduser -S -D -H -h /var/lib/haproxy -s /bin/false \
 	-G haproxy -g haproxy haproxy 2>/dev/null
 
 # move config to new location
diff --git a/main/icecast/icecast.pre-install b/main/icecast/icecast.pre-install
index 562611b666046d1fed5059aa847504bddd5bf0cb..3ee9c4a087470541e86ef22721fdddb88d3d11ec 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 -g icecast icecast 2>/dev/null
+adduser -S -D -h /var/log/icecast -s /sbin/nologin -g icecast icecast 2>/dev/null
 
 exit 0
diff --git a/main/ircservices/ircservices.pre-install b/main/ircservices/ircservices.pre-install
index 2f08491d543c92a88311a75bae09d21db1f51e41..ee50e3bce0cb7e598f5713212cb82e85f314483c 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 -g ircservices ircservices 2>/dev/null
+adduser -S -D -h /var/lib/ircservices -s /sbin/nologin -g ircservices ircservices 2>/dev/null
 
 exit 0
diff --git a/main/kamailio/kamailio.pre-install b/main/kamailio/kamailio.pre-install
index e38239dd6f04da0a28ae0e1ec0bc0b6aa8956b81..1e63e58eef4eed3eaca39859049641e78b78c733 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 -g kamailio kamailio 2>/dev/null
+adduser -S -D -H -h /var/empty -s /sbin/nologin -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 80f256276350c0c69c8fb70a309c5b40f819a218..25f2b018543d7257334d1112288f448e4a321b32 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 -g lighttpd lighttpd 2>/dev/null
+adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin -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 818fda5f02926ca4540c27c25b4ee7b344173f03..2b33bcdbc33280666444d250889654afe62ee459 100644
--- a/main/logcheck/logcheck.pre-install
+++ b/main/logcheck/logcheck.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S logcheck 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G logcheck -g logcheck logcheck 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -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 14677b1fb60acce8cb206e1a27500061b3a85d07..2ab1374c76484eae741d58e7dec26b33e3757aa6 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 -g mysql mysql 2>/dev/null
+adduser -S -D -h /var/lib/mysql -s /sbin/nologin -G mysql -g mysql mysql 2>/dev/null
 
 exit 0
diff --git a/main/memcached/memcached.pre-install b/main/memcached/memcached.pre-install
index 4440f4ee1a4dd86038355c1e55630a906c0fc6c6..8ff0274efe84613e90bdba2687ce3b585fde34f0 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 -g memcached memcached 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -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 63876f7731bf379f6dbe6e5dadc4e66df037df59..c2a9d1f139206040e63579b8a2ae6fb0bb1ddbf1 100644
--- a/main/mini_httpd/mini_httpd.pre-install
+++ b/main/mini_httpd/mini_httpd.pre-install
@@ -8,8 +8,8 @@ if [ -f /etc/mini_httpd.conf ] && ! [ -L /etc/mini_httpd.conf ]; then
 fi
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin \
-        -D -g minihttpd minihttpd 2>/dev/null
+adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin \
+        -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 4fc20e601dd86cb3dc9c67f7e574e6f7484abd5a..e06c1c7c1ac6a69bcd69160e877ab99b11604e6f 100644
--- a/main/minidlna/minidlna.pre-install
+++ b/main/minidlna/minidlna.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S minidlna 2>/dev/null
-adduser -S -H -h /var/run/minidlna -s /sbin/nologin -D -G minidlna \
+adduser -S -D -H -h /var/run/minidlna -s /sbin/nologin -G minidlna \
 	-g minidlna minidlna 2>/dev/null
 
 exit 0
diff --git a/main/mlmmj/mlmmj.pre-install b/main/mlmmj/mlmmj.pre-install
index 7a7b32c0fae2ae9a23e916f25f429103c38d2d24..e3a58210db15845410db8e198139476ccd0287d9 100644
--- a/main/mlmmj/mlmmj.pre-install
+++ b/main/mlmmj/mlmmj.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S mlmmj 2>/dev/null
-adduser -S -H -h /var/spool/mlmmj -s /sbin/nologin -D -G mlmmj -g mlmmj mlmmj 2>/dev/null
+adduser -S -D -H -h /var/spool/mlmmj -s /sbin/nologin -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 518d9f2443fc8fe9036dca009795ffc05731f205..960dfd84b8884ea9303a9ee0240e573424a29b3e 100644
--- a/main/mosquitto/mosquitto.pre-install
+++ b/main/mosquitto/mosquitto.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S mosquitto 2>/dev/null
-adduser -S -H -h /var/empty -s /sbin/nologin -D -G mosquitto -g mosquitto mosquitto 2>/dev/null
+adduser -S -D -H -h /var/empty -s /sbin/nologin -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 934307b65a27faef5cd75298982479c987987579..c0439b71ec6a9ce589afc817ccb3ebfd32a0b643 100644
--- a/main/mpd/mpd.pre-install
+++ b/main/mpd/mpd.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/mpd -s /sbin/nologin -G audio -D -g mpd mpd 2>/dev/null
+adduser -S -D -h /var/lib/mpd -s /sbin/nologin -G audio -g mpd mpd 2>/dev/null
 
 exit 0
diff --git a/main/mumble/murmur.pre-install b/main/mumble/murmur.pre-install
index 980ed34a63d4b32327af6b1f7ea545df3d920ed8..d8be4a5a8800467cad63f0919c5191946975b896 100755
--- a/main/mumble/murmur.pre-install
+++ b/main/mumble/murmur.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S murmur 2>/dev/null
-adduser -S -h /var/lib/murmur -s /sbin/nologin -G murmur -g "Mumble daemon" -H -D murmur 2>/dev/null
+adduser -S -D -H -h /var/lib/murmur -s /sbin/nologin -G murmur -g "Mumble daemon" murmur 2>/dev/null
 
 exit 0
diff --git a/main/nagios/nagios.pre-install b/main/nagios/nagios.pre-install
index 2e2dbbfa33cc100082dafc8b08e153e7ee084904..eaa87fba312559c25daeedd10fcd5ca3565d830c 100644
--- a/main/nagios/nagios.pre-install
+++ b/main/nagios/nagios.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S nagios 2>/dev/null
-adduser -S -G nagios -H -h /var/nagios -s /sbin/nologin -g nagios nagios 2>/dev/null
+adduser -S -H -h /var/nagios -s /sbin/nologin -G nagios -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 00bd0dedfb0a7af6fae998b10cb3e24bf4959581..8512f43ddaa77f04f263c8fd2850a83020aa4da0 100644
--- a/main/nginx-initscripts/nginx-initscripts.pre-install
+++ b/main/nginx-initscripts/nginx-initscripts.pre-install
@@ -2,8 +2,8 @@
 
 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 -g nginx nginx 2>/dev/null
+adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin -G nginx \
+	-g nginx nginx 2>/dev/null
 addgroup nginx www-data 2>/dev/null
 
 exit 0
diff --git a/main/nginx/nginx-common.pre-install b/main/nginx/nginx-common.pre-install
index 27bf2de7cb3c2cd2fd2b730d05ff4ec7f549ac88..ae5b6857acf7ebc4fe6fb591a7a0871a5a3810cc 100644
--- a/main/nginx/nginx-common.pre-install
+++ b/main/nginx/nginx-common.pre-install
@@ -2,7 +2,7 @@
 
 addgroup -Sg 82 www-data 2>/dev/null
 addgroup -S nginx 2>/dev/null
-adduser -S -h /var/lib/nginx -g "nginx" -s /sbin/nologin -DHG nginx nginx 2>/dev/null
+adduser -S -D -H -h /var/lib/nginx -s /sbin/nologin -G nginx -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 bb5f05a03b4072299f682fd1cedfb4980fa0a60d..c073447b370270868210795d7147f0d24df41789 100644
--- a/main/ngircd/ngircd.pre-install
+++ b/main/ngircd/ngircd.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /etc/ngircd -s /sbin/nologin -D -g ngircd ngircd 2>/dev/null
+adduser -S -D -H -h /etc/ngircd -s /sbin/nologin -g ngircd ngircd 2>/dev/null
 
 exit 0
diff --git a/main/nrpe/nrpe.pre-install b/main/nrpe/nrpe.pre-install
index e00f960454fc38f6a0c997ec448e4d80bb56b248..875a9fadceaa1be0906ca1e20080b7b1e4af35b4 100644
--- a/main/nrpe/nrpe.pre-install
+++ b/main/nrpe/nrpe.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -H -h /dev/null -s /sbin/nologin -D -g nagios nagios 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -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 a94f6e083f2c8f4e7d636b4283e2ffb0298aed56..f523c972153d3dfaac0f3b03c52ee00aa94041a3 100644
--- a/main/nsd/nsd.pre-install
+++ b/main/nsd/nsd.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S nsd 2>/dev/null
-adduser -S -G nsd -H -h /var/db/nsd -s /sbin/nologin -g nsd nsd 2>/dev/null
+adduser -S -H -h /var/db/nsd -s /sbin/nologin -G nsd -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 58b4216dc312e9b5ae8b0fa9a97614a481a106ab..b6a03db50fe86a7914f438031a26e217ce552ebf 100644
--- a/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
+++ b/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
@@ -4,7 +4,7 @@ username=nslcd
 groupname=$username
 
 addgroup -S $username 2>/dev/null
-adduser -S -H -h /var/run/$username -s /sbin/nologin -D -G $groupname \
+adduser -S -D -H -h /var/run/$username -s /sbin/nologin -G $groupname \
 	-g $username $username 2>/dev/null
 
 exit 0
diff --git a/main/ntop/ntop.pre-install b/main/ntop/ntop.pre-install
index 9af92bb5d7d8146c7e44373b0bc634d130a3d13b..0fea81baa7b2ee906e631f7c9aa20d43e28efb46 100755
--- a/main/ntop/ntop.pre-install
+++ b/main/ntop/ntop.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S ntop 2>/dev/null
-adduser -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D -g ntop ntop 2>/dev/null
+adduser -S -D -H -h /var/lib/ntop -s /sbin/nologin -G ntop -g ntop ntop 2>/dev/null
 
 exit 0
diff --git a/main/openldap/openldap.pre-install b/main/openldap/openldap.pre-install
index a01f4fa3037c9d3f85b4b144e87d723ad5c5609d..eb6b10fa415ce059d6c28ea6148fe49623ba754f 100644
--- a/main/openldap/openldap.pre-install
+++ b/main/openldap/openldap.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S ldap 2>/dev/null
-adduser -S -h /usr/lib/openldap -s /sbin/nologin -D -H -g "OpenLdap User" \
-	-G ldap ldap 2>/dev/null
+adduser -S -D -H -h /usr/lib/openldap -s /sbin/nologin -G ldap \
+	-g "OpenLdap User" ldap 2>/dev/null
 
 exit 0
diff --git a/main/openntpd/openntpd.pre-install b/main/openntpd/openntpd.pre-install
index c3d9986a6555a5ac12c2c13ab8081f068f9460a1..6b8204b64faf49c95942a9a217f27e91b3827562 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 -g ntp ntp 2>/dev/null
+adduser -S -D -H -h /var/empty -s /sbin/nologin -g ntp ntp 2>/dev/null
 
 exit 0
diff --git a/main/opensmtpd/opensmtpd.pre-install b/main/opensmtpd/opensmtpd.pre-install
index 8cbebc19a082dfd4550c90e64514e181a6cafadb..b81ac7534ba7dc2b738755bef9fc2b24911303d9 100644
--- a/main/opensmtpd/opensmtpd.pre-install
+++ b/main/opensmtpd/opensmtpd.pre-install
@@ -2,8 +2,8 @@
 
 addgroup -S smtpd 2>/dev/null
 addgroup -S smtpq 2>/dev/null
-adduser -S -H -D -s /sbin/nologin -h /dev/null -g 'SMTP Daemon' -G smtpd smtpd 2>/dev/null
-adduser -S -H -D -s /sbin/nologin -h /dev/null -g 'SMTPD Queue' -G smtpq smtpq 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G smtpd -g 'SMTP Daemon' smtpd 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G smtpq -g 'SMTPD Queue' smtpq 2>/dev/null
 mkdir -p /var/spool/mail
 
 exit 0
diff --git a/main/openvpn/openvpn.pre-install b/main/openvpn/openvpn.pre-install
index ff553b811f571c28b412158876e5e09fa40f2b28..c072535310da0372207545dde2d0917fdfa00427 100644
--- a/main/openvpn/openvpn.pre-install
+++ b/main/openvpn/openvpn.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S openvpn 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G openvpn -g openvpn openvpn 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -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 2b9092985ab17a6c03bd1ade51905066790ae874..2e654f28dcecc48f823a38a8ba6d49b34e8865db 100644
--- a/main/pcsc-lite/pcsc-lite.pre-install
+++ b/main/pcsc-lite/pcsc-lite.pre-install
@@ -4,7 +4,7 @@ username=pcscd
 groupname=$username
 
 addgroup -S $username 2>/dev/null
-adduser -S -H -h /var/run/$username -s /sbin/nologin -D -G $groupname \
+adduser -S -D -H -h /var/run/$username -s /sbin/nologin -G $groupname \
 	-g $username $username 2>/dev/null
 
 exit 0
diff --git a/main/perdition/perdition.pre-install b/main/perdition/perdition.pre-install
index 1c0b01e339b19b91840081f470591a09ce3fe890..b268e4caa678a72cb7ddd1e5421535426394e1ea 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 -g perdition perdition 2>/dev/null
+adduser -S -D -h /var/run/perdition -s /sbin/nologin -G perdition -g perdition perdition 2>/dev/null
 
 exit 0
diff --git a/main/postfix/postfix.pre-install b/main/postfix/postfix.pre-install
index d00c3eb1cd81f38763790e43507567904c1469f6..fc62efb3cf062912d0d848f205b34a985b39750e 100644
--- a/main/postfix/postfix.pre-install
+++ b/main/postfix/postfix.pre-install
@@ -4,6 +4,6 @@ addgroup -S postfix 2>/dev/null
 addgroup -S postdrop 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 -g vmail vmail 2>/dev/null
+adduser -S -H -h /var/mail/domains -s /sbin/nologin -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 f70564c42f5e2c861a889b23ff9ef78aeb5cac8c..5f1d560e156f3696f261e08a1de97d0efaa1801a 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 -g postgrey postgrey 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -g postgrey postgrey 2>/dev/null
 
 exit 0
diff --git a/main/privoxy/privoxy.pre-install b/main/privoxy/privoxy.pre-install
index 3f6c75971f7f271cf88369d76d5fe8e7bb6a980c..60a2f76aaf4f52eef6a5751b24137b6acb01aced 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 -g privoxy privoxy 2>/dev/null
+adduser -S -D -h /var/log/privoxy -s /sbin/nologin -G privoxy -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 f3b44716c34065b2060b9724a06d25bea6e73426..53569ceb6e63515f574b633c1e4e9d1b767989d4 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 -g quagga quagga 2>/dev/null
+adduser -S -D -h /var/run/quagga -s /sbin/nologin -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 f3b44716c34065b2060b9724a06d25bea6e73426..53569ceb6e63515f574b633c1e4e9d1b767989d4 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 -g quagga quagga 2>/dev/null
+adduser -S -D -h /var/run/quagga -s /sbin/nologin -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 01ec63dd7ad03295c806ac5635e09255dca46fc7..bbfc977182263c2179ab59db8180eee35c0cf6e1 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 -g quassel quassel 2>/dev/null
+adduser -S -D -h /var/lib/quassel -s /sbin/nologin -g quassel quassel 2>/dev/null
 addgroup -S quassel 2>/dev/null
 addgroup quassel quassel
 
diff --git a/main/radvd/radvd.pre-install b/main/radvd/radvd.pre-install
index 44c76a2e5e1a88cbc9aa1d7810066d5325ed8b27..d2e238a74f1aedcc3f75b8e05638b75266deb9c1 100644
--- a/main/radvd/radvd.pre-install
+++ b/main/radvd/radvd.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S radvd 2>/dev/null
-adduser -S -s /sbin/nologin -D -H -G radvd \
+adduser -S -D -H -s /sbin/nologin -G radvd \
 	-g "Router advertisement (radvd) user" radvd 2>/dev/null
 
 exit 0
diff --git a/main/redis/redis.pre-install b/main/redis/redis.pre-install
index b6cbd05a13c663a03c9654ce398b87f0fe4a8f5d..f7321312665986343990940a48167f063286d1ca 100644
--- a/main/redis/redis.pre-install
+++ b/main/redis/redis.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S redis 2>/dev/null
-adduser -S -H -h /var/lib/redis -s /bin/false -D -G redis -g redis redis 2>/dev/null
+adduser -S -D -H -h /var/lib/redis -s /bin/false -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 fe6a8268dfb16e07cd38b7080a6d4b2ce8b58efd..771cdbf7b62b487feec09824c3f1be97833c92fc 100644
--- a/main/rpcbind/rpcbind.pre-install
+++ b/main/rpcbind/rpcbind.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S rpc 2>/dev/null
-adduser -S -h /var/lib/rpcbind -s /sbin/nologin -D -G rpc -g rpc rpc 2>/dev/null
+adduser -S -D -h /var/lib/rpcbind -s /sbin/nologin -G rpc -g rpc rpc 2>/dev/null
 
 exit 0
diff --git a/main/rt4/rt4.pre-install b/main/rt4/rt4.pre-install
index 88327830ab722a348b40b72cf65683366ea399b0..f6f102451cacda01f1aacb06c6042894c4b37f06 100644
--- a/main/rt4/rt4.pre-install
+++ b/main/rt4/rt4.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S rt4 2>/dev/null
-adduser -S -s /sbin/nologin -G rt4 -D -H -g "Request Tracker 4 user" rt4 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G rt4 -g "Request Tracker 4 user" rt4 2>/dev/null
 
 exit 0
diff --git a/main/rtnppd/rtnppd.pre-install b/main/rtnppd/rtnppd.pre-install
index ec21795914d947cf177cc4479783d80416aada8e..7151c5d7fe88b5212f3f36a2d7f71cb36126d672 100644
--- a/main/rtnppd/rtnppd.pre-install
+++ b/main/rtnppd/rtnppd.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S rtnppd 2>/dev/null
-adduser -S -G rtnppd -H -h /var/run/rtnppd -s /sbin/nologin -g rtnppd rtnppd 2>/dev/null
+adduser -S -H -h /var/run/rtnppd -s /sbin/nologin -G rtnppd -g rtnppd rtnppd 2>/dev/null
 
 exit 0
diff --git a/main/rtpproxy/rtpproxy.pre-install b/main/rtpproxy/rtpproxy.pre-install
index 93a10a866fad540b7903f9ca5580afc0b094cf9b..939be220bb42854ae3644411d63414751c7eec2f 100644
--- a/main/rtpproxy/rtpproxy.pre-install
+++ b/main/rtpproxy/rtpproxy.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S rtpproxy 2>/dev/null
-adduser -S -G rtpproxy -H -h /usr/share/rtpproxy -s /sbin/nologin -g rtpproxy rtpproxy 2>/dev/null
+adduser -S -H -h /usr/share/rtpproxy -s /sbin/nologin -G rtpproxy -g rtpproxy rtpproxy 2>/dev/null
 
 exit 0
diff --git a/main/sems/sems.pre-install b/main/sems/sems.pre-install
index 83d4f74068208bd63bc1b9a581be90ae701cef10..5fe904da6521f93b706dcb1d7358a8b0b67af4f3 100644
--- a/main/sems/sems.pre-install
+++ b/main/sems/sems.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S sems 2>/dev/null
-adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems -g sems sems 2>/dev/null
+adduser -S -D -H -h /var/empty -s /sbin/nologin -G sems -g sems sems 2>/dev/null
 
 exit 0
diff --git a/main/sircbot/sircbot.pre-install b/main/sircbot/sircbot.pre-install
index c9db4723fe44b6ae708a51f90be6a57ccebc6b99..139b023b73d0c0dc81d4b7bbb5b55b357b6ba286 100644
--- a/main/sircbot/sircbot.pre-install
+++ b/main/sircbot/sircbot.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S sircbot 2>/dev/null
-adduser -S -h /var/run/sircbot -G sircbot -D -g sircbot sircbot 2>/dev/null
+adduser -S -D -h /var/run/sircbot -G sircbot -g sircbot sircbot 2>/dev/null
 
 exit 0
diff --git a/main/smokeping/smokeping.pre-install b/main/smokeping/smokeping.pre-install
index f13ff10901f404d84b72dec29b2ff09e26748989..9c470e2a1dee2a737886c0f96c835debc8a84b1f 100644
--- a/main/smokeping/smokeping.pre-install
+++ b/main/smokeping/smokeping.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S smokeping 2>/dev/null
-adduser -S -h /var/lib/smokeping -D -G smokeping -g smokeping smokeping 2>/dev/null
+adduser -S -D -h /var/lib/smokeping -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 e0c65c802065cfab682922ffde40a0a87e9d7719..156454e55392882843efc250cb15967cef553290 100644
--- a/main/snmptt/snmptt.pre-install
+++ b/main/snmptt/snmptt.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/spool/snmptt -s /sbin/nologin -D -g snmptt snmptt 2>/dev/null
+adduser -S -D -h /var/spool/snmptt -s /sbin/nologin -g snmptt snmptt 2>/dev/null
 
 exit 0
diff --git a/main/snort/snort.pre-install b/main/snort/snort.pre-install
index bd0791bab21d242fb818def95d707086ec0a7fb7..e40838da5597058784ea7e14e113a4bd2f8192eb 100644
--- a/main/snort/snort.pre-install
+++ b/main/snort/snort.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/log/snort -s /sbin/nologin -D -g snort snort 2>/dev/null
+adduser -S -D -h /var/log/snort -s /sbin/nologin -g snort snort 2>/dev/null
 
 exit 0
diff --git a/main/strongswan/strongswan.pre-install b/main/strongswan/strongswan.pre-install
index 83b93284a153580b9d26a2b9c6a700457bc82f91..da43ede6655048bcb7b7feeb4045a1b280b18b4e 100644
--- a/main/strongswan/strongswan.pre-install
+++ b/main/strongswan/strongswan.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S ipsec 2>/dev/null
-adduser -S -H -h /var/empty -s /sbin/nologin -D -G ipsec -g ipsec ipsec 2>/dev/null
+adduser -S -D -H -h /var/empty -s /sbin/nologin -G ipsec -g ipsec ipsec 2>/dev/null
 
 exit 0
diff --git a/main/subversion/subversion.pre-install b/main/subversion/subversion.pre-install
index 955baeefbd6a817782ea7750895c95642715d5f2..7091359c5a85383ae361be2001a1c62f267f8f33 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 -g svn svn -D -h /var/svn -G svnusers 2>/dev/null
+adduser -S -D -h /var/svn -G svnusers -g svn svn 2>/dev/null
 
 exit 0
diff --git a/main/tinyproxy/tinyproxy.pre-install b/main/tinyproxy/tinyproxy.pre-install
index b21324a9c7375f0d6cdf1422f203434063c29f23..d2e1d624b215a95df99164b8330230a284d53fd3 100755
--- a/main/tinyproxy/tinyproxy.pre-install
+++ b/main/tinyproxy/tinyproxy.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S tinyproxy 2>/dev/null
-adduser -S -s /sbin/nologin -D -H -h /var/run/tinyproxy -G tinyproxy \
+adduser -S -D -H -h /var/run/tinyproxy -s /sbin/nologin -G tinyproxy \
 	-g "tinyproxy user" tinyproxy 2>/dev/null
 
 # return with success even if user already exist
diff --git a/main/trac/trac.pre-install b/main/trac/trac.pre-install
index 05e9f2a448070eebdb7438603a60823264c77c87..40d70f69967832917b7de31ed960269d14ab6b3b 100644
--- a/main/trac/trac.pre-install
+++ b/main/trac/trac.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S tracd 2>/dev/null
-adduser -S -s /sbin/nologin -G tracd -D -H -g tracd tracd 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G tracd -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 9ccac8cdc04178169ad999516ab7421b106c7742..ad8a575236413364182b344e038e140375280c1a 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 -g transmission transmission 2>/dev/null
+adduser -S -D -h /var/lib/transmission -s /sbin/nologin -g transmission transmission 2>/dev/null
 
 exit 0
diff --git a/main/umurmur/umurmur.post-install b/main/umurmur/umurmur.post-install
index 771aed1c8ece2bacd33a1a721064bc864c3e815c..adff9264e41ff53df8b4e1bc1549bacd2ab2aa1d 100755
--- a/main/umurmur/umurmur.post-install
+++ b/main/umurmur/umurmur.post-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S umurmur 2>/dev/null
-adduser -S -s /bin/false -G umurmur -h /var/run/umurmurd -D -g umurmur umurmur 2>/dev/null
+adduser -S -D -h /var/run/umurmurd -s /bin/false -G umurmur -g umurmur umurmur 2>/dev/null
 
 exit 0
diff --git a/main/unbound/unbound.pre-install b/main/unbound/unbound.pre-install
index 63c00e9cdc607433941f03e62efb0ca95291a4b1..94144c78788550c3b08eed350508ec80ab38fa47 100644
--- a/main/unbound/unbound.pre-install
+++ b/main/unbound/unbound.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S unbound 2>/dev/null
-adduser -S -s /sbin/nologin -D -H -h /etc/unbound -G unbound \
+adduser -S -D -H -h /etc/unbound -s /sbin/nologin -G unbound \
 	-g "Unbound user" unbound 2>/dev/null
 
 exit 0
diff --git a/main/varnish/varnish.pre-install b/main/varnish/varnish.pre-install
index 4e34a099c7246956213c8dfdbde7b34bde6856f6..5b4f828993d7a89b1229b980b902ff6ea30c40b4 100644
--- a/main/varnish/varnish.pre-install
+++ b/main/varnish/varnish.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S varnish 2>/dev/null
-adduser -S -H -h /var/lib/varnish -s /sbin/nologin -D -G varnish -g varnish varnish 2>/dev/null
+adduser -S -D -H -h /var/lib/varnish -s /sbin/nologin -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 0e423506925121f3913fb189a69076b1ae6b1604..3c3e08d47bf5be69f2e8fa0202d0119ccdcce60b 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 -g vde2-net vde2-net 2>/dev/null
+adduser -S -D -H -h /var/run/vde2 -s /sbin/nologin -G vde2-net -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 778c27a8c3a84454005da7ded7e6526f591ba4b8..aed6c189324c8700f8de315c86fd18385475fdf5 100644
--- a/main/vlc/vlc-daemon.pre-install
+++ b/main/vlc/vlc-daemon.pre-install
@@ -5,7 +5,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 -g vlc vlc 2>/dev/null
+adduser -S -D -h /home/vlc -s /bin/sh -G vlc -g vlc vlc 2>/dev/null
 
 # make sure vlc are in all groups
 for group in $groups; do
diff --git a/main/zabbix/zabbix-agent.pre-install b/main/zabbix/zabbix-agent.pre-install
index 7cc5be2f89680bbe7d221cf17cbfa282e4a27abd..9cc2bfb90893b57a4a5fbb9fa7551a3a912c3783 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 -g zabbix zabbix 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G zabbix -g zabbix zabbix 2>/dev/null
 
 exit 0
diff --git a/main/zabbix/zabbix.pre-install b/main/zabbix/zabbix.pre-install
index 7cc5be2f89680bbe7d221cf17cbfa282e4a27abd..9cc2bfb90893b57a4a5fbb9fa7551a3a912c3783 100644
--- a/main/zabbix/zabbix.pre-install
+++ b/main/zabbix/zabbix.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 -g zabbix zabbix 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G zabbix -g zabbix zabbix 2>/dev/null
 
 exit 0
diff --git a/testing/3proxy/3proxy.pre-install b/testing/3proxy/3proxy.pre-install
index c314228962431e3016738f2cd10ee2e61c57a087..961dcc5a75dae58a3d3e3ea3fdd4e54dc812171d 100644
--- a/testing/3proxy/3proxy.pre-install
+++ b/testing/3proxy/3proxy.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S 3proxy 2>/dev/null
-adduser -S -G 3proxy -h /var/log/3proxy -s /sbin/nologin -D -g 3proxy 3proxy 2>/dev/null
+adduser -S -D -h /var/log/3proxy -s /sbin/nologin -G 3proxy -g 3proxy 3proxy 2>/dev/null
 
 exit 0
diff --git a/testing/at/at.pre-install b/testing/at/at.pre-install
index e3c28ec89805522beea97409b18087c5085d43ac..38035104777ad4ed94fd9338588c390cae1827fb 100644
--- a/testing/at/at.pre-install
+++ b/testing/at/at.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S at 2>/dev/null
-adduser -S -H -s /bin/false -D -g at at 2>/dev/null
+adduser -S -D -H -s /bin/false -g at at 2>/dev/null
 addgroup at at 2>/dev/null
 
 exit 0
diff --git a/testing/bitcoin/bitcoin.pre-install b/testing/bitcoin/bitcoin.pre-install
index 9cf75bbfb7322662e24a2c0d28877d8f545978f8..3f83b3810a1aa05fb85d7912e3c6ea36f9246088 100644
--- a/testing/bitcoin/bitcoin.pre-install
+++ b/testing/bitcoin/bitcoin.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S bitcoin 2>/dev/null
-adduser -S -H -h /var/lib/bitcoin -g bitcoin -G bitcoin -D -s /sbin/nologin bitcoin 2>/dev/null
+adduser -S -D -H -h /var/lib/bitcoin -s /sbin/nologin -G bitcoin -g bitcoin bitcoin 2>/dev/null
 
 exit 0
diff --git a/testing/buildbot-slave/buildbot-slave.pre-install b/testing/buildbot-slave/buildbot-slave.pre-install
index ca33aace548ee4d9fd297897c0f1ece04d992283..695f71607bc4a2230b6a0c7859f8aa35bd35ba5b 100644
--- a/testing/buildbot-slave/buildbot-slave.pre-install
+++ b/testing/buildbot-slave/buildbot-slave.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
+adduser -S -D -H -h /home/buildbot -s /sbin/nologin -g buildbot buildbot 2>/dev/null
 
 exit 0
diff --git a/testing/buildbot/buildbot.pre-install b/testing/buildbot/buildbot.pre-install
index ca33aace548ee4d9fd297897c0f1ece04d992283..695f71607bc4a2230b6a0c7859f8aa35bd35ba5b 100644
--- a/testing/buildbot/buildbot.pre-install
+++ b/testing/buildbot/buildbot.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
+adduser -S -D -H -h /home/buildbot -s /sbin/nologin -g buildbot buildbot 2>/dev/null
 
 exit 0
diff --git a/testing/clapf/clapf.pre-install b/testing/clapf/clapf.pre-install
index eec8afe4f2cd878a649f8f8f7811d880f2fc182f..01c4585c926a47153052e4f33171e88cea2b4cbc 100644
--- a/testing/clapf/clapf.pre-install
+++ b/testing/clapf/clapf.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -s /bin/false -D -g clamav clamav 2>/dev/null
+adduser -S -D -H -s /bin/false -g clamav clamav 2>/dev/null
 
 exit 0
diff --git a/testing/cluster-glue/cluster-glue.pre-install b/testing/cluster-glue/cluster-glue.pre-install
index ce20da41023f873e3dd57f1af76f17606530653f..31249dba6d4b7ccf2d3c398fbc51d3164c01500d 100644
--- a/testing/cluster-glue/cluster-glue.pre-install
+++ b/testing/cluster-glue/cluster-glue.pre-install
@@ -1,10 +1,12 @@
 #!/bin/sh
 
 addgroup -S haclient 2>/dev/null
-adduser -S -g hacluster hacluster \
+adduser -S \
 	-h /var/lib/heartbeat/cores/hacluster \
-	-G haclient \
 	-s /sbin/nologin \
+	-G haclient \
+	-g hacluster \
+	hacluster \
 	2>/dev/null
 
 exit 0
diff --git a/testing/consul/consul.pre-install b/testing/consul/consul.pre-install
index 1b9ea9daab91a363281f401a58f4c15000cb71b9..ea7f6848ec2600cbfc62c94b984c40724363a22a 100644
--- a/testing/consul/consul.pre-install
+++ b/testing/consul/consul.pre-install
@@ -2,6 +2,6 @@
 
 # Create consul group and user
 addgroup -S consul 2>/dev/null
-adduser -S -h /var/consul -s /sbin/nologin -G consul -D -g consul consul 2>/dev/null
+adduser -S -D -h /var/consul -s /sbin/nologin -G consul -g consul consul 2>/dev/null
 
 exit 0
diff --git a/testing/dante/dante-server.pre-install b/testing/dante/dante-server.pre-install
index d11b1637c77b121b79255b78ddf7781266c7a029..8bf90b40cfcce1f52231382baa821788032a78ee 100644
--- a/testing/dante/dante-server.pre-install
+++ b/testing/dante/dante-server.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S sockd 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G sockd -g sockd sockd 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G sockd -g sockd sockd 2>/dev/null
 
 exit 0
diff --git a/testing/darwin-streaming-server/darwin-streaming-server.post-install b/testing/darwin-streaming-server/darwin-streaming-server.post-install
index 3d4786e0ad54513c1b790a49eed8fc162bd31b06..c2a4511d907e2f88d75f5efb3511d602a07b8636 100644
--- a/testing/darwin-streaming-server/darwin-streaming-server.post-install
+++ b/testing/darwin-streaming-server/darwin-streaming-server.post-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S qtss 2>/dev/null
-adduser -S -s /bin/false -G qtss -h /var/darwinstreaming -D -g qtss qtss 2>/dev/null
+adduser -S -D -h /var/darwinstreaming -s /bin/false -G qtss -g qtss qtss 2>/dev/null
 
 exit 0
diff --git a/testing/dbmail/dbmail.pre-install b/testing/dbmail/dbmail.pre-install
index bca9a6fe487590993d5b65adb22fde27c28d783d..21650fc928f065501b456752f122f1f41a483105 100644
--- a/testing/dbmail/dbmail.pre-install
+++ b/testing/dbmail/dbmail.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -s /bin/false -D -H -h /var/lib/dbmail -g dbmail dbmail 2>/dev/null
+adduser -S -D -H -h /var/lib/dbmail -s /bin/false -g dbmail dbmail 2>/dev/null
 
 exit 0
diff --git a/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install b/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
index 34a4de62f094690856d09dc1fa6756f940fbbf7b..651c01fe265a3a860b1580bf37ba2a4be433b39a 100644
--- a/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
+++ b/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S dnscrypt 2>/dev/null
-adduser -S -H -h /var/empty -G dnscrypt -D -s /sbin/nologin -g dnscrypt dnscrypt 2>/dev/null
+adduser -S -D -H -h /var/empty -s /sbin/nologin -G dnscrypt -g dnscrypt dnscrypt 2>/dev/null
 
 exit 0
diff --git a/testing/drizzle/drizzle.post-install b/testing/drizzle/drizzle.post-install
index 64016b23f8ca3dad01a3a7689803c94b19cc478a..ac0260b2c90498d75c96501f97dfdf3ace734dfd 100644
--- a/testing/drizzle/drizzle.post-install
+++ b/testing/drizzle/drizzle.post-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S drizzle 2>/dev/null
-adduser -SDHG drizzle -g drizzle drizzle 2>/dev/null
+adduser -S -D -H -G drizzle -g drizzle drizzle 2>/dev/null
 
 exit 0
diff --git a/testing/dspam/dspam.pre-install b/testing/dspam/dspam.pre-install
index e7a059cbb467945cd677d999adb4bb0614d74f9a..e78f1e6f34191cab99543fff1894931c822a1382 100644
--- a/testing/dspam/dspam.pre-install
+++ b/testing/dspam/dspam.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/dspam -s /bin/false -D -g dspam dspam 2>/dev/null
+adduser -S -D -h /var/lib/dspam -s /bin/false -g dspam dspam 2>/dev/null
 chown dspam:dspam /var/lib/dspam
 
 exit 0
diff --git a/testing/ejabberd/ejabberd.pre-install b/testing/ejabberd/ejabberd.pre-install
index efda04bed68ef063c474125dfd670548e69e44ba..61c3d72f73c93ad5990bf12a411d098f9787250e 100644
--- a/testing/ejabberd/ejabberd.pre-install
+++ b/testing/ejabberd/ejabberd.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -g ejabberd ejabberd 2>/dev/null
+adduser -S -D -H -h /var/lib/ejabberd -G ejabberd -g ejabberd ejabberd 2>/dev/null
 
 exit 0
diff --git a/testing/elasticsearch/elasticsearch.pre-install b/testing/elasticsearch/elasticsearch.pre-install
index 54cd0d8f1310500e9a48ba08f17416af5757b4b1..2e0b742e5812389a34b17b9eaf63a7b8c00287be 100644
--- a/testing/elasticsearch/elasticsearch.pre-install
+++ b/testing/elasticsearch/elasticsearch.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S elastico 2>/dev/null
-adduser -S -h /var/lib/elasticsearch -s /sbin/nologin -G elastico \
-	-g "added by apk for elasticsearch" -DH elastico 2>/dev/null
+adduser -S -D -H -h /var/lib/elasticsearch -s /sbin/nologin -G elastico \
+	-g "added by apk for elasticsearch" elastico 2>/dev/null
 
 exit 0
diff --git a/testing/emby/emby.pre-install b/testing/emby/emby.pre-install
index 70555e47b8c165773e35915216567ccb658b9a5b..d287d7307f17bd7d138b46ea931dbe879ce28ac5 100644
--- a/testing/emby/emby.pre-install
+++ b/testing/emby/emby.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S emby 2>/dev/null
-adduser -S -D -h /var/lib/emby -s /sbin/nologin -g "Emby media server" \
-	-G emby emby 2>/dev/null
+adduser -S -D -h /var/lib/emby -s /sbin/nologin -G emby \
+	-g "Emby media server" emby 2>/dev/null
 
 exit 0
diff --git a/testing/exim/exim.pre-install b/testing/exim/exim.pre-install
index 816ed9650f406a1ab1eae136aa9f0a659c34a2a3..fc5167ca7d6c11ac14deeebebb6172cdd06fb779 100644
--- a/testing/exim/exim.pre-install
+++ b/testing/exim/exim.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S exim 2>/dev/null
-adduser -S -h /var/spool/exim -g "exim" -s /sbin/nologin -DHG exim exim 2>/dev/null
+adduser -S -D -H -h /var/spool/exim -s /sbin/nologin -G exim -g exim exim 2>/dev/null
 adduser exim mail 2>/dev/null
 
 exit 0
diff --git a/testing/fcron/fcron.pre-install b/testing/fcron/fcron.pre-install
index d4d66fdda2695135d2b78a8c9f5da980be74e13f..b1587917825908e7d06a7f45808a2dee6846a94d 100644
--- a/testing/fcron/fcron.pre-install
+++ b/testing/fcron/fcron.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -g fcron fcron -H -s /sbin/nologin 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -g fcron fcron 2>/dev/null
 addgroup -S fcron 2>/dev/null
 
 exit 0
diff --git a/testing/gdnsd/gdnsd.pre-install b/testing/gdnsd/gdnsd.pre-install
index 8e8af592f48cca8a4d080b5e13996e07beb64205..0bd9cb7f664bb6866e1371bd46594ccce17c96f8 100644
--- a/testing/gdnsd/gdnsd.pre-install
+++ b/testing/gdnsd/gdnsd.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S gdnsd 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd -g gdnsd gdnsd 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G gdnsd -g gdnsd gdnsd 2>/dev/null
 
 exit 0
diff --git a/testing/gogs/gogs.pre-install b/testing/gogs/gogs.pre-install
index b1d3258c919321986a60c717036b1331f89f9d02..69cae04746dcfcfcdafd6f8eb80540b4dd7b5212 100644
--- a/testing/gogs/gogs.pre-install
+++ b/testing/gogs/gogs.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/gogs -s /bin/ash -G www-data -D -g gogs gogs 2>/dev/null
+adduser -S -D -h /var/lib/gogs -s /bin/ash -G www-data -g gogs gogs 2>/dev/null
 passwd -u gogs 2>/dev/null
 
 exit 0
diff --git a/testing/h2o/h2o.pre-install b/testing/h2o/h2o.pre-install
index 92631f1587917f33d506356881e11d237d17f1e6..9af1c4ca671c0ff556abd230c0fd6501b7bceb37 100644
--- a/testing/h2o/h2o.pre-install
+++ b/testing/h2o/h2o.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -s /sbin/nologin -h /var/www -D -H -g h2o h2o 2>/dev/null 
+adduser -S -D -H -h /var/www -s /sbin/nologin -g h2o h2o 2>/dev/null
 addgroup -S -g 82 www-data 2>/dev/null
 addgroup h2o www-data 2>/dev/null
 
diff --git a/testing/knot/knot.pre-install b/testing/knot/knot.pre-install
index 60789deea7b52baff58dba285078840b51360939..6fc6e21461789461223fe1b3f5c41d7bc986a46e 100644
--- a/testing/knot/knot.pre-install
+++ b/testing/knot/knot.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S knot 2>/dev/null
-adduser -S -s /sbin/nologin -G knot -D -H -g knot knot 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G knot -g knot knot 2>/dev/null
 
 exit 0
diff --git a/testing/lightdm/lightdm.pre-install b/testing/lightdm/lightdm.pre-install
index b7efe57975a550b40f8f3bf9778148709e18e583..ab2add488353115c9f28ff0e2e1c84bbcc1e84d5 100644
--- a/testing/lightdm/lightdm.pre-install
+++ b/testing/lightdm/lightdm.pre-install
@@ -3,6 +3,6 @@
 name=lightdm
 
 addgroup -S $name 2>/dev/null
-adduser -S -H -h /var/run/lightdm -s /bin/false -D -G $name -g $name $name 2>/dev/null
+adduser -S -D -H -h /var/run/lightdm -s /bin/false -G $name -g $name $name 2>/dev/null
 
 exit 0
diff --git a/testing/lizardfs/lizardfs.pre-install b/testing/lizardfs/lizardfs.pre-install
index e4b14a6197ad1744e88aa8e29cb8930cd936f9be..83ce5445756da9ece96e6d3ea51da6d70ede6b3c 100644
--- a/testing/lizardfs/lizardfs.pre-install
+++ b/testing/lizardfs/lizardfs.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S mfs 2>/dev/null
-adduser -S -H -h /var/lib/mfs -s /sbin/nologin -D -G mfs -g mfs mfs \
+adduser -S -D -H -h /var/lib/mfs -s /sbin/nologin -G mfs -g mfs mfs \
 	2>/dev/null
 
 exit 0
diff --git a/testing/logstash/logstash.pre-install b/testing/logstash/logstash.pre-install
index 6844757497d65755a60f559c1b345bd4aea85de7..62c4f2b6d36de8d9645bc0790157d38a120199f4 100644
--- a/testing/logstash/logstash.pre-install
+++ b/testing/logstash/logstash.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /usr/share/logstash -s /sbin/nologin -D -H -g "Logstash User" \
-	-G daemon logstash 2>/dev/null
+adduser -S -D -H -h /usr/share/logstash -s /sbin/nologin \
+	-G daemon -g "Logstash User" logstash 2>/dev/null
 
 exit 0
diff --git a/testing/lshell/lshell.pre-install b/testing/lshell/lshell.pre-install
index 8aedffa5339d846fb643457d781655b5c097ff86..4aba0754ca260ba9322098b65833db59d0883613 100644
--- a/testing/lshell/lshell.pre-install
+++ b/testing/lshell/lshell.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S lshell 2>/dev/null
-adduser -S -H -h /var/empty -G lshell -D -s /sbin/nologin -g lshell lshell 2>/dev/null
+adduser -S -D -H -h /var/empty -s /sbin/nologin -G lshell -g lshell lshell 2>/dev/null
 
 exit 0
diff --git a/testing/lusca/lusca.pre-install b/testing/lusca/lusca.pre-install
index f70964f97e2e6def063989322dae6cf98330b837..e73a38b80eb1d3015ac50334bcb21ae6387dfecf 100644
--- a/testing/lusca/lusca.pre-install
+++ b/testing/lusca/lusca.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin 2>/dev/null
+adduser -S -D -h /var/cache/lusca -s /sbin/nologin -g lusca lusca 2>/dev/null
 addgroup -S winbind 2>/dev/null
 addgroup lusca winbind 2>/dev/null
 
diff --git a/testing/lusca/lusca.pre-upgrade b/testing/lusca/lusca.pre-upgrade
index f70964f97e2e6def063989322dae6cf98330b837..e73a38b80eb1d3015ac50334bcb21ae6387dfecf 100644
--- a/testing/lusca/lusca.pre-upgrade
+++ b/testing/lusca/lusca.pre-upgrade
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin 2>/dev/null
+adduser -S -D -h /var/cache/lusca -s /sbin/nologin -g lusca lusca 2>/dev/null
 addgroup -S winbind 2>/dev/null
 addgroup lusca winbind 2>/dev/null
 
diff --git a/testing/milter-greylist/milter-greylist.pre-install b/testing/milter-greylist/milter-greylist.pre-install
index c104db9a74e549caa73aa2f44360398e8de4000c..cf578f00684a15689c10d46ad299cf85c2e86cf5 100644
--- a/testing/milter-greylist/milter-greylist.pre-install
+++ b/testing/milter-greylist/milter-greylist.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S smmsp 2>/dev/null
-adduser -h /var/lib/milter-greylist -s /sbin/nologin -S -G smmsp -g smmsp smmsp 2>/dev/null
+adduser -S -h /var/lib/milter-greylist -s /sbin/nologin -G smmsp -g smmsp smmsp 2>/dev/null
 
 exit 0
diff --git a/testing/mongodb/mongodb.pre-install b/testing/mongodb/mongodb.pre-install
index 12b09a19696f996c4f6e0b06c7e5a288c3044c09..1ed56eb7f40be8dead69ad59e9b5d17665402387 100644
--- a/testing/mongodb/mongodb.pre-install
+++ b/testing/mongodb/mongodb.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S mongodb 2>/dev/null
-adduser -S -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin -g mongodb mongodb 2>/dev/null
+adduser -S -D -h /var/lib/mongodb -s /sbin/nologin -G mongodb -g mongodb mongodb 2>/dev/null
 
 exit 0
diff --git a/testing/motion/motion.pre-install b/testing/motion/motion.pre-install
index 91a4c34c0163b9770b25458f9deea70c1f64dd84..de22bc1913ab338f70c158a0cc576dd5ce04713f 100644
--- a/testing/motion/motion.pre-install
+++ b/testing/motion/motion.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S motion 2>/dev/null
-adduser -S -h /home/motion -s /bin/false -G motion -D -g motion motion 2>/dev/null
+adduser -S -D -h /home/motion -s /bin/false -G motion -g motion motion 2>/dev/null
 addgroup motion video 2>/dev/null
 
 exit 0
diff --git a/testing/munin/munin-node.pre-install b/testing/munin/munin-node.pre-install
index 06802674f349d98ff569283fed419a4a0c05f60a..7352cf2fdd968c6833ebb05ac92ef665e3571922 100644
--- a/testing/munin/munin-node.pre-install
+++ b/testing/munin/munin-node.pre-install
@@ -4,7 +4,7 @@ username=munin
 groupname="$username"
 
 addgroup -S "$username" 2>/dev/null
-adduser -S -H -h /run/"$username" -s /sbin/nologin -D -G "$groupname" \
+adduser -S -D -H -h /run/"$username" -s /sbin/nologin -G "$groupname" \
 	-g "$username" "$username" 2>/dev/null
 
 exit 0
diff --git a/testing/namecoin/namecoin.pre-install b/testing/namecoin/namecoin.pre-install
index 530d027236a7d94129016dbcba73f65732b06709..f41286d1bda4e17d98df96517029237aeef65443 100644
--- a/testing/namecoin/namecoin.pre-install
+++ b/testing/namecoin/namecoin.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S namecoin 2>/dev/null
-adduser -S -h /var/lib/namecoin -g namecoin -G namecoin -D -s /sbin/nologin namecoin 2>/dev/null
+adduser -S -D -h /var/lib/namecoin -s /sbin/nologin -G namecoin -g namecoin namecoin 2>/dev/null
 
 exit 0
diff --git a/testing/nginx-naxsi/nginx-naxsi.pre-install b/testing/nginx-naxsi/nginx-naxsi.pre-install
index 00bd0dedfb0a7af6fae998b10cb3e24bf4959581..8512f43ddaa77f04f263c8fd2850a83020aa4da0 100644
--- a/testing/nginx-naxsi/nginx-naxsi.pre-install
+++ b/testing/nginx-naxsi/nginx-naxsi.pre-install
@@ -2,8 +2,8 @@
 
 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 -g nginx nginx 2>/dev/null
+adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin -G nginx \
+	-g nginx nginx 2>/dev/null
 addgroup nginx www-data 2>/dev/null
 
 exit 0
diff --git a/testing/ntopng/ntopng.pre-install b/testing/ntopng/ntopng.pre-install
index 9af92bb5d7d8146c7e44373b0bc634d130a3d13b..0fea81baa7b2ee906e631f7c9aa20d43e28efb46 100755
--- a/testing/ntopng/ntopng.pre-install
+++ b/testing/ntopng/ntopng.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S ntop 2>/dev/null
-adduser -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D -g ntop ntop 2>/dev/null
+adduser -S -D -H -h /var/lib/ntop -s /sbin/nologin -G ntop -g ntop ntop 2>/dev/null
 
 exit 0
diff --git a/testing/opennebula/opennebula-node-kvm.pre-install b/testing/opennebula/opennebula-node-kvm.pre-install
index 73173a745eff476bf8c8a6db8491308ba7bb277a..fa541642eccb6674b8fd3e3ac258e68cf6ee17c2 100644
--- a/testing/opennebula/opennebula-node-kvm.pre-install
+++ b/testing/opennebula/opennebula-node-kvm.pre-install
@@ -2,8 +2,8 @@
 
 addgroup -S oneadmin 2>/dev/null
 addgroup -S libvirt 2>/dev/null
-adduser -S -D -s /bin/ash \
-	-h /var/lib/one -G oneadmin \
+adduser -S -D \
+	-h /var/lib/one -s /bin/ash -G oneadmin \
 	-g "OpenNebula user" oneadmin 2>/dev/null
 addgroup oneadmin libvirt 2>/dev/null
 addgroup oneadmin readproc 2>/dev/null
diff --git a/testing/opennebula/opennebula.pre-install b/testing/opennebula/opennebula.pre-install
index 15527ebc01f1e6d3adfacbf8566c0f57c6f5f969..d54936abe762c44f72e5f64c290e13b54160b502 100644
--- a/testing/opennebula/opennebula.pre-install
+++ b/testing/opennebula/opennebula.pre-install
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 addgroup -S oneadmin 2>/dev/null
-adduser -S -D -s /bin/ash \
-	-H -h /var/lib/one -G oneadmin \
+adduser -S -D -H \
+	-s /bin/ash -h /var/lib/one -G oneadmin \
 	-g "OpenNebula user" oneadmin 2>/dev/null
 passwd -u oneadmin 2>/dev/null
 
diff --git a/testing/opensips/opensips.pre-install b/testing/opensips/opensips.pre-install
index 8d0774990b6bc426a6062ab7f50071ae6e009a9b..8eebc7b0d8cf2e4135dbb12082ccbc9f1df6d88d 100644
--- a/testing/opensips/opensips.pre-install
+++ b/testing/opensips/opensips.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /var/empty -s /bin/false -D -g opensips opensips 2>/dev/null
+adduser -S -D -H -h /var/empty -s /bin/false -g opensips opensips 2>/dev/null
 
 exit 0
diff --git a/testing/openxcap/openxcap.pre-install b/testing/openxcap/openxcap.pre-install
index 7c90e2775c155530fbf5b2b89e1bdca4dd844cbf..0a932aa4fe669b6e1e6b5b236e02d3c342d6f483 100755
--- a/testing/openxcap/openxcap.pre-install
+++ b/testing/openxcap/openxcap.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S openxcap 2>/dev/null
-adduser -S -G openxcap -h /var/run/openxcap -s /bin/false -D -H -g openxcap openxcap 2>/dev/null
+adduser -S -D -H -h /var/run/openxcap -s /bin/false -G openxcap -g openxcap openxcap 2>/dev/null
 
 exit 0
diff --git a/testing/pdns/pdns.pre-install b/testing/pdns/pdns.pre-install
index bf00793e47e8d2718fad122b6af42602eb820cc1..e80add6412fc83653ccd6b8d065a3a4903d2104a 100644
--- a/testing/pdns/pdns.pre-install
+++ b/testing/pdns/pdns.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /var/empty -D -s /bin/false -g pdns pdns 2>/dev/null
+adduser -S -D -H -h /var/empty -s /bin/false -g pdns pdns 2>/dev/null
 
 exit 0
diff --git a/testing/prosody/prosody.pre-install b/testing/prosody/prosody.pre-install
index c15127d59db4cd39626812e516a7dfade3c74a2f..39d9cfaddadc0a9da790d3f567c9e3eb8a8bb1c0 100644
--- a/testing/prosody/prosody.pre-install
+++ b/testing/prosody/prosody.pre-install
@@ -4,8 +4,8 @@ addgroup -S prosody 2>/dev/null
 adduser -S -D \
 	-h /var/lib/prosody \
 	-s /sbin/nologin \
-	-g "Prosody XMPP Server" \
     -G prosody \
+	-g "Prosody XMPP Server" \
 	prosody 2>/dev/null
 
 exit 0
diff --git a/testing/qpage/qpage.pre-install b/testing/qpage/qpage.pre-install
index 5e7eed0842c606c293ab24ea2505708177193502..45f03d0bd084a6c26a34233ff23ccc92150d6f22 100644
--- a/testing/qpage/qpage.pre-install
+++ b/testing/qpage/qpage.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/qpage -s /bin/false -G qpage -D -g qpage qpage 2>/dev/null
+adduser -S -D -h /var/lib/qpage -s /bin/false -G qpage -g qpage qpage 2>/dev/null
 
 exit 0
diff --git a/testing/quicktun/quicktun.pre-install b/testing/quicktun/quicktun.pre-install
index b3c4c5088b95f98985e50e79f5c7ea390a7cb994..e010a88732508a8482b0be0a7d9fef4863cc9f52 100755
--- a/testing/quicktun/quicktun.pre-install
+++ b/testing/quicktun/quicktun.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S quicktun 2>/dev/null
-adduser -S -h /var/run/quicktun -s /sbin/nologin -G quicktun -g "quicktun user" -H -D quicktun 2>/dev/null
+adduser -S -D -H -h /var/run/quicktun -s /sbin/nologin -G quicktun -g "quicktun user" quicktun 2>/dev/null
 
 exit 0
diff --git a/testing/radicale/radicale.pre-install b/testing/radicale/radicale.pre-install
index c15cf63cc47c9c98b3f34d7bc527505b4c943c1e..147f8851755a052cdc2c6c705af542884d960323 100644
--- a/testing/radicale/radicale.pre-install
+++ b/testing/radicale/radicale.pre-install
@@ -3,7 +3,7 @@
 name=radicale
 
 addgroup -S $name 2>/dev/null
-adduser -S -H -h /var/lib/$name -s /sbin/nologin -D -G $name -g $name $name 2>/dev/null
+adduser -S -D -H -h /var/lib/$name -s /sbin/nologin -G $name -g $name $name 2>/dev/null
 addgroup $name $name 2>/dev/null
 
 exit 0
diff --git a/testing/rancid/rancid.pre-install b/testing/rancid/rancid.pre-install
index 51e0dc84e7431634fc726279dff3a7ab597a676e..f98f571bfe7df029172c28130c6fc195f04698b3 100644
--- a/testing/rancid/rancid.pre-install
+++ b/testing/rancid/rancid.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S netadm 2>/dev/null
-adduser -S -h /var/rancid -s /bin/sh -G netadm -D -g rancid rancid 2>/dev/null
+adduser -S -D -h /var/rancid -s /bin/sh -G netadm -g rancid rancid 2>/dev/null
 
 exit 0
diff --git a/testing/rmilter/rmilter.pre-install b/testing/rmilter/rmilter.pre-install
index bda1a9468396ebed13bce46272ad316be1950c63..f84c689dc7a20317d989755bb1642a3735e57be0 100644
--- a/testing/rmilter/rmilter.pre-install
+++ b/testing/rmilter/rmilter.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S rmilter 2>dev/null
-adduser -S -h /run/rmilter -g "rmilter" -s /bin/false -DHG rmilter rmilter 2>/dev/null
+adduser -S -D -H -h /run/rmilter -s /bin/false -G rmilter -g rmilter rmilter 2>/dev/null
 
 exit 0
diff --git a/testing/rrdbot/rrdbot.pre-install b/testing/rrdbot/rrdbot.pre-install
index 7004829ad7e1207590cd2d7ebc4bd805b135636d..5d2e03ac29a2c3217ed37414a9b47f11901b9604 100644
--- a/testing/rrdbot/rrdbot.pre-install
+++ b/testing/rrdbot/rrdbot.pre-install
@@ -2,6 +2,6 @@
 
 # this user should be included in alpine-baselayout-1.2.
 # included here for backward compability.
-adduser -S -H -s /bin/false -D -g rrdbotd rrdbotd 2>/dev/null
+adduser -S -D -H -s /bin/false -g rrdbotd rrdbotd 2>/dev/null
 
 exit 0
diff --git a/testing/rspamd/rspamd.pre-install b/testing/rspamd/rspamd.pre-install
index b107f1c2eccf80740c58419c8c96e86bffd9519e..b37dcf34227bf24efb5eaaa377735101650ef373 100644
--- a/testing/rspamd/rspamd.pre-install
+++ b/testing/rspamd/rspamd.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S rspamd 2>/dev/null
-adduser -S -h /var/lib/rspamd -g "rspamd" -s /bin/false -DHG rspamd rspamd 2>/dev/null
+adduser -S -D -H -h /var/lib/rspamd -s /bin/false -G rspamd -g rspamd rspamd 2>/dev/null
 
 exit 0
diff --git a/testing/sipwise-sems/sipwise-sems.pre-install b/testing/sipwise-sems/sipwise-sems.pre-install
index 83d4f74068208bd63bc1b9a581be90ae701cef10..5fe904da6521f93b706dcb1d7358a8b0b67af4f3 100644
--- a/testing/sipwise-sems/sipwise-sems.pre-install
+++ b/testing/sipwise-sems/sipwise-sems.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S sems 2>/dev/null
-adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems -g sems sems 2>/dev/null
+adduser -S -D -H -h /var/empty -s /sbin/nologin -G sems -g sems sems 2>/dev/null
 
 exit 0
diff --git a/testing/socklog/socklog.post-install b/testing/socklog/socklog.post-install
index a663d3dc325bd8c6a8f0a7dd6dfff3870bb8e25f..de53f609d3d61a01b8faa0c3e13700ce7df0a48e 100644
--- a/testing/socklog/socklog.post-install
+++ b/testing/socklog/socklog.post-install
@@ -3,7 +3,7 @@
 # Copyright 2015 Stuart Cardall (developer@it-offshore.co.uk)
 # Distributed under the terms of the GNU General Public License, v2 or later #
 
-adduser -S -H -h /var/empty -D -s /sbin/nologin -g log log 2>/dev/null
+adduser -S -D -H -h /var/empty -s /sbin/nologin -g log log 2>/dev/null
 if [ ! -d /etc/sv/socklog-unix ]; then
 	socklog-conf unix nobody log
 	mkdir -p /etc/service
diff --git a/testing/stunnel/stunnel.pre-install b/testing/stunnel/stunnel.pre-install
index 22e6f41594266ef9341d0f112a81172c3d710aba..972669c12a7eeee247d65ffc03925b72575df1a2 100644
--- a/testing/stunnel/stunnel.pre-install
+++ b/testing/stunnel/stunnel.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S stunnel 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G stunnel -g stunnel stunnel 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G stunnel -g stunnel stunnel 2>/dev/null
 
 exit 0
diff --git a/testing/tengine/tengine.pre-install b/testing/tengine/tengine.pre-install
index 5a3d4b1f56f2a0f17f12c55cb0372f7ebd052d37..bb59be1f4f275dc1323f18c69e5a962350f2670a 100644
--- a/testing/tengine/tengine.pre-install
+++ b/testing/tengine/tengine.pre-install
@@ -2,8 +2,8 @@
 
 addgroup -S -g 82 www-data 2>/dev/null
 addgroup -S tengine 2>/dev/null
-adduser -S -G tengine -H -h /var/www/localhost/htdocs -s /sbin/nologin \
-	-D -g tengine tengine 2>/dev/null
+adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin \
+	-G tengine -g tengine tengine 2>/dev/null
 addgroup tengine www-data 2>/dev/null
 
 exit 0
diff --git a/testing/tengine/tengine.pre-upgrade b/testing/tengine/tengine.pre-upgrade
index 5a3d4b1f56f2a0f17f12c55cb0372f7ebd052d37..bb59be1f4f275dc1323f18c69e5a962350f2670a 100644
--- a/testing/tengine/tengine.pre-upgrade
+++ b/testing/tengine/tengine.pre-upgrade
@@ -2,8 +2,8 @@
 
 addgroup -S -g 82 www-data 2>/dev/null
 addgroup -S tengine 2>/dev/null
-adduser -S -G tengine -H -h /var/www/localhost/htdocs -s /sbin/nologin \
-	-D -g tengine tengine 2>/dev/null
+adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin \
+	-G tengine -g tengine tengine 2>/dev/null
 addgroup tengine www-data 2>/dev/null
 
 exit 0
diff --git a/testing/thttpd/thttpd.pre-install b/testing/thttpd/thttpd.pre-install
index 12e860797eefa37693c0a1665f5447faa2680711..47dd3b066321a66aad0d501bfdba1e6f18d8bbbb 100644
--- a/testing/thttpd/thttpd.pre-install
+++ b/testing/thttpd/thttpd.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 -g thttpd thttpd 2>/dev/null
+adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin \
+        -g thttpd thttpd 2>/dev/null
 addgroup thttpd www-data 2>/dev/null
 
 exit 0
diff --git a/testing/tor/tor.pre-install b/testing/tor/tor.pre-install
index 5796d114f9c79124fc2f9ec5269014c5cc4d2070..9827f01bc1ecf7fb6dac77cd324f053f37c9cb9f 100644
--- a/testing/tor/tor.pre-install
+++ b/testing/tor/tor.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/run/tor -s /sbin/nologin -D -g tor tor 2>/dev/null
+adduser -S -D -h /var/run/tor -s /sbin/nologin -g tor tor 2>/dev/null
 
 exit 0
diff --git a/testing/tvheadend-git/tvheadend-git.pre-install b/testing/tvheadend-git/tvheadend-git.pre-install
index 3999c33bb89f587e281a853b929b0f17be535b06..26f7f73f698ced1c2d5e593b460d4080c7f5871c 100644
--- a/testing/tvheadend-git/tvheadend-git.pre-install
+++ b/testing/tvheadend-git/tvheadend-git.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -s /sbin/nologin -H -h /usr/share/tvheadend -g tvheadend tvheadend 2>/dev/null
+adduser -S -H -h /usr/share/tvheadend -s /sbin/nologin -g tvheadend tvheadend 2>/dev/null
 adduser tvheadend video
 
 exit 0
diff --git a/testing/vault/vault.pre-install b/testing/vault/vault.pre-install
index 3df21bb3d2e9bc5fca27ad15440183c33c078955..20b34354887ddaf1a5f455b308184c607a86992a 100644
--- a/testing/vault/vault.pre-install
+++ b/testing/vault/vault.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S vault 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G vault -g vault vault 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G vault -g vault vault 2>/dev/null
 
 exit 0
diff --git a/testing/vnstat/vnstat.pre-install b/testing/vnstat/vnstat.pre-install
index e253007d2b82f499f79ce9697c0cd1839708347a..2a94edea9d6e8d6b543fb002731c78ce422211b0 100644
--- a/testing/vnstat/vnstat.pre-install
+++ b/testing/vnstat/vnstat.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S vnstat 2>/dev/null
-adduser -S -h /var/lib/ -H -s /bin/false -D -G vnstat -g vnstat vnstat 2>/dev/null
+adduser -S -D -H -h /var/lib/ -s /bin/false -G vnstat -g vnstat vnstat 2>/dev/null
 
 exit 0
diff --git a/testing/wt/wt.pre-install b/testing/wt/wt.pre-install
index 07311bd8fda4e46d372b9ac3d20e912912a6e2af..b007724a0c520e845c1ed63b64cceb968fd1a0a4 100644
--- a/testing/wt/wt.pre-install
+++ b/testing/wt/wt.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -s /sbin/nologin -D -g wt wt 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -g wt wt 2>/dev/null
 addgroup wt www-data 2>/dev/null
 
 exit 0
diff --git a/testing/x2goserver/x2goserver.pre-install b/testing/x2goserver/x2goserver.pre-install
index 6a20a96a5c4d955626b51803c191391382df4eef..f22241a576096a62c60922d21338d1f7966f8f6b 100755
--- a/testing/x2goserver/x2goserver.pre-install
+++ b/testing/x2goserver/x2goserver.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S x2gouser 2>/dev/null
-adduser -S -D -G x2gouser -h /var/lib/x2go -s /bin/false -g x2gouser x2gouser 2>/dev/null
+adduser -S -D -h /var/lib/x2go -s /bin/false -G x2gouser -g x2gouser x2gouser 2>/dev/null
 
 exit 0
diff --git a/testing/zabbix/zabbix-agent.pre-install b/testing/zabbix/zabbix-agent.pre-install
index 2464f275cac1606952ed929c3d9b20b79e9b7b74..946f83512fda72c89f805ed5b064ef83e8e8f2c3 100644
--- a/testing/zabbix/zabbix-agent.pre-install
+++ b/testing/zabbix/zabbix-agent.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S zabbix 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G zabbix -g zabbix zabbix 2>/dev/null
 addgroup -S -g 30 zabbix 2>/dev/null
 
 exit 0
diff --git a/testing/zabbix/zabbix.pre-install b/testing/zabbix/zabbix.pre-install
index 7cc5be2f89680bbe7d221cf17cbfa282e4a27abd..9cc2bfb90893b57a4a5fbb9fa7551a3a912c3783 100644
--- a/testing/zabbix/zabbix.pre-install
+++ b/testing/zabbix/zabbix.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 -g zabbix zabbix 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G zabbix -g zabbix zabbix 2>/dev/null
 
 exit 0
diff --git a/unmaintained/apache-couchdb/apache-couchdb.post-install b/unmaintained/apache-couchdb/apache-couchdb.post-install
index ae1da50210ad7105867607cd2838e544cb36c0bb..1946d2b5b4fabb7a2046c11d27cfa14dbfa815b9 100755
--- a/unmaintained/apache-couchdb/apache-couchdb.post-install
+++ b/unmaintained/apache-couchdb/apache-couchdb.post-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S couchdb 2>/dev/null
-adduser -S -h /var/run/couchdb -s /bin/false -G couchdb -D -g couchdb couchdb 2>/dev/null
+adduser -S -D -h /var/run/couchdb -s /bin/false -G couchdb -g couchdb couchdb 2>/dev/null
 
 exit 0
diff --git a/unmaintained/ejabberd-git/ejabberd-git.pre-install b/unmaintained/ejabberd-git/ejabberd-git.pre-install
index efda04bed68ef063c474125dfd670548e69e44ba..61c3d72f73c93ad5990bf12a411d098f9787250e 100644
--- a/unmaintained/ejabberd-git/ejabberd-git.pre-install
+++ b/unmaintained/ejabberd-git/ejabberd-git.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -g ejabberd ejabberd 2>/dev/null
+adduser -S -D -H -h /var/lib/ejabberd -G ejabberd -g ejabberd ejabberd 2>/dev/null
 
 exit 0
diff --git a/unmaintained/kde-workspace/kde-workspace.pre-install b/unmaintained/kde-workspace/kde-workspace.pre-install
index b55298b1ea4fa65fdbee317d72d91bd89fd5c8ce..a54f3ada6f29205d0b5c4b840b0712156049945d 100644
--- a/unmaintained/kde-workspace/kde-workspace.pre-install
+++ b/unmaintained/kde-workspace/kde-workspace.pre-install
@@ -3,6 +3,6 @@
 name=kdm
 
 addgroup -S $name 2>/dev/null
-adduser -S -H -h /var/run/kdm -s /bin/false -D -G $name -g $name $name 2>/dev/null
+adduser -S -D -H -h /var/run/kdm -s /bin/false -G $name -g $name $name 2>/dev/null
 
 exit 0
diff --git a/unmaintained/shadowircd/shadowircd.pre-install b/unmaintained/shadowircd/shadowircd.pre-install
index 58b2a85c807a13539d115525b77220f2fb8b7beb..4120e456a61d3bf78567dcf44bd6eee4574748d1 100644
--- a/unmaintained/shadowircd/shadowircd.pre-install
+++ b/unmaintained/shadowircd/shadowircd.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/run/shadowircd -s /bin/false -D -g ircd ircd 2>/dev/null
+adduser -D -S -h /var/run/shadowircd -s /bin/false -g ircd ircd 2>/dev/null
 
 exit 0