diff --git a/community/caddy/caddy.pre-install b/community/caddy/caddy.pre-install
index 7bf003d657a88844825fdcef5055853081de5f4f..dc78350388668eeee53fa6513485cd4293104164 100644
--- a/community/caddy/caddy.pre-install
+++ b/community/caddy/caddy.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
+
 adduser -S -h /var/lib/caddy -D -s /sbin/nologin -g caddy caddy 2>/dev/null
 adduser caddy www-data 2>/dev/null
+
 exit 0
diff --git a/community/davfs2/davfs2.pre-install b/community/davfs2/davfs2.pre-install
index 062477c7fd9476ab1422e9631c906a119705d6b9..2accd542329f40ec4e99a30b252ff5f1f443ca39 100755
--- a/community/davfs2/davfs2.pre-install
+++ b/community/davfs2/davfs2.pre-install
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-if ! getent group davfs2 >/dev/null; then
-	addgroup -S davfs2
-fi
+addgroup -S davfs2 2>/dev/null
+
 exit 0
diff --git a/community/docker-registry/docker-registry.pre-install b/community/docker-registry/docker-registry.pre-install
index 3bc3eabc9866fb1858787fa9bc4d2d4fe6407b8f..5d1fbbbed3b1f9bd96f0c32ce1f54f2647112f8c 100644
--- a/community/docker-registry/docker-registry.pre-install
+++ b/community/docker-registry/docker-registry.pre-install
@@ -2,4 +2,5 @@
 
 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
+
 exit 0
diff --git a/community/docker/docker.pre-install b/community/docker/docker.pre-install
index 8a1dec6f2a471756c8c45de8486368aed4256d3e..8cd2d63f3470ae447f078dc0f92a988bb80725b5 100644
--- a/community/docker/docker.pre-install
+++ b/community/docker/docker.pre-install
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-if ! getent group docker >/dev/null; then
-	addgroup -S docker
-fi
+addgroup -S docker 2>/dev/null
+
 exit 0
diff --git a/community/domoticz/domoticz.pre-install b/community/domoticz/domoticz.pre-install
index 077e0faf8091e39432f71266761a585ce781fcc5..5162f88385633ec6df364f4275f64cb599bfd2bf 100644
--- a/community/domoticz/domoticz.pre-install
+++ b/community/domoticz/domoticz.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -h /var/lib/domoticz -D -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 e84e09e0c683cbf73ffdec62e94e6b1d2dffdab4..7b0002ce346236b29c9ca4e480d0020ad8d06406 100644
--- a/community/icinga2/icinga2.pre-install
+++ b/community/icinga2/icinga2.pre-install
@@ -1,6 +1,8 @@
 #!/bin/sh
+
 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 icinga icingacmd 2>/dev/null 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 4cde63921ebb689de6540fdd5d4ee14c43b429e5..da9a0259594d7eec0c44d6a07c2301122f6aba27 100644
--- a/community/minetest/minetest-server.pre-install
+++ b/community/minetest/minetest-server.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -s /sbin/nologin -D -h /var/lib/minetest -g minetest minetest games 2>/dev/null
+
 exit 0
diff --git a/community/oscam/oscam.pre-install b/community/oscam/oscam.pre-install
index 2f5f5d9d4dd073459c17fc53ba79b02f091b77fe..4e0c49a166b99503714742e169345bef804366b2 100644
--- a/community/oscam/oscam.pre-install
+++ b/community/oscam/oscam.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
+
 adduser -S -H -D -s /sbin/nologin -g oscam oscam 2>/dev/null
 addgroup oscam usb 2>/dev/null
+
 exit 0
diff --git a/community/seafile/seafile-server.pre-install b/community/seafile/seafile-server.pre-install
index 66e7a2ccff7fca985403846a8f915f90fe39461b..b5c1b4f64e17d19fa8d89f8f61201e9d4951c3d0 100644
--- a/community/seafile/seafile-server.pre-install
+++ b/community/seafile/seafile-server.pre-install
@@ -4,4 +4,5 @@ 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
+
 exit 0
diff --git a/community/smstools/smstools.pre-install b/community/smstools/smstools.pre-install
index d9e1d36963cc2423c0975d3e22dbed15e9047a1e..0a5106f6e58e8a45cf0cfe342cfdd11cc72b5cec 100755
--- a/community/smstools/smstools.pre-install
+++ b/community/smstools/smstools.pre-install
@@ -1,5 +1,7 @@
 #!/bin/sh
-addgroup -S smsd &>/dev/null
-adduser -S -h /var/spool/sms -s /sbin/nologin -G smsd -D -g smsd smsd &>/dev/null
-adduser -G uucp smsd &>/dev/null
+
+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 -G uucp smsd 2>/dev/null
+
 exit 0
diff --git a/community/sniproxy/sniproxy.pre-install b/community/sniproxy/sniproxy.pre-install
index c56f31de536b5e08c895c6fe8dadb08eb0777452..aa2f7dfca5a39f818070717760d812959e7c3c63 100644
--- a/community/sniproxy/sniproxy.pre-install
+++ b/community/sniproxy/sniproxy.pre-install
@@ -1,4 +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
+
 exit 0
diff --git a/community/sword/sword.pre-install b/community/sword/sword.pre-install
index d8abdb59bfe302efb556f9033cb4b0ba94fa1614..2ebce6d5640e0640d5519f70d0d4e5b8717a60cd 100755
--- a/community/sword/sword.pre-install
+++ b/community/sword/sword.pre-install
@@ -1,3 +1,6 @@
 #!/bin/sh
+
 echo "Adding 'sword' group for installing SWORD modules systemwide"
-addgroup -S sword 2>/dev/null >&2 || true
+addgroup -S sword 2>/dev/null
+
+exit 0
diff --git a/community/syncthing/syncthing.pre-install b/community/syncthing/syncthing.pre-install
index 002a54f3dea2fdf40f74c012369fe9f3d8a75e9a..ab337cca31e362e8979ab09f549766a8c99ae46f 100644
--- a/community/syncthing/syncthing.pre-install
+++ b/community/syncthing/syncthing.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -h /var/lib/syncthing -s /sbin/nologin -D -g syncthing syncthing 2>/dev/null
+
 exit 0
diff --git a/community/tvheadend/tvheadend.pre-install b/community/tvheadend/tvheadend.pre-install
index 6fee0b4e056e75160a372da0ee53c0aee09d6341..6b64423424c8ee5b64ac3c6d8b1012ef894b9c1c 100644
--- a/community/tvheadend/tvheadend.pre-install
+++ b/community/tvheadend/tvheadend.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
+
 adduser -S -G video -s /sbin/nologin -H -h /usr/share/tvheadend -g tvheadend tvheadend 2>/dev/null
 addgroup tvheadend usb 2>/dev/null
+
 exit 0
diff --git a/main/abuild/abuild.pre-install b/main/abuild/abuild.pre-install
index fb2cf9e31dbabd140e0d3e3dd5080ec3299d0c2f..fd3d39a368788c18bdd61d390ec7a9ed1bc3eed2 100644
--- a/main/abuild/abuild.pre-install
+++ b/main/abuild/abuild.pre-install
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-if ! getent group abuild >/dev/null; then
-	addgroup -S abuild
-fi
+addgroup -S abuild 2>/dev/null
+
 exit 0
diff --git a/main/alpine-baselayout/alpine-baselayout.pre-install b/main/alpine-baselayout/alpine-baselayout.pre-install
index 3b9f14108362aedb6b6564b756a51144a64bbbd9..fc0d0b9f5dab5ce07189ead013e0fb8a6fbc0bc8 100644
--- a/main/alpine-baselayout/alpine-baselayout.pre-install
+++ b/main/alpine-baselayout/alpine-baselayout.pre-install
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-if [ -e /etc/group ] && ! grep -q '^shadow:' /etc/group; then
-        addgroup -S -g 42 shadow
-fi
+addgroup -S -g 42 shadow 2>/dev/null
 
+exit 0
diff --git a/main/alpine-baselayout/alpine-baselayout.pre-upgrade b/main/alpine-baselayout/alpine-baselayout.pre-upgrade
index 8a7098f7d1cc4498c5aeb76d42cc33ba7ebf087e..f7c8db83c417302a69b89db21eea4502b688c044 100644
--- a/main/alpine-baselayout/alpine-baselayout.pre-upgrade
+++ b/main/alpine-baselayout/alpine-baselayout.pre-upgrade
@@ -14,6 +14,6 @@ for i in /etc/modprobe.d/*; do
 	mv "$i" "$i".conf
 done
 
-if [ -e /etc/group ] && ! grep -q '^shadow:' /etc/group; then
-	addgroup -S -g 42 shadow
-fi
+addgroup -S -g 42 shadow 2>/dev/null
+
+exit 0
diff --git a/main/amavisd-new/amavisd-new.pre-install b/main/amavisd-new/amavisd-new.pre-install
index d0c07006d0b62c09f5041b67faf6ef165d665807..5223f9fb2068c2ed81fc5c25fcd0e0e24f813465 100755
--- a/main/amavisd-new/amavisd-new.pre-install
+++ b/main/amavisd-new/amavisd-new.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S amavis 2>/dev/null
 adduser -S -D -G amavis -h /var/amavis -s /sbin/nologin -g amavis amavis 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/apache2/apache2.pre-install b/main/apache2/apache2.pre-install
index cb803238f0e96982d170c2c5b375d618c51bce64..f142d894e6a61dc125fa0c019c069801c4b3247f 100644
--- a/main/apache2/apache2.pre-install
+++ b/main/apache2/apache2.pre-install
@@ -1,5 +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
 addgroup apache www-data 2>/dev/null
+
 exit 0
diff --git a/main/apache2/apache2.pre-upgrade b/main/apache2/apache2.pre-upgrade
index dbc1d68e438d7e13285ba9d66545097cc5fd8e58..bb3dba99cbdbcf2c5ee7753ed59d405a203bd44b 100644
--- a/main/apache2/apache2.pre-upgrade
+++ b/main/apache2/apache2.pre-upgrade
@@ -2,4 +2,5 @@
 
 addgroup -S -g 82 www-data 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 a4928ebe7b63c3443e2c0a255b3f158a7223ad31..2fdf497dd5d1069a300ffe6953c9f35e01930cc5 100644
--- a/main/aports-build/aports-build.pre-install
+++ b/main/aports-build/aports-build.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 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 d75874fc45e429a6486d79ac2f5f79c81db5891e..56fdfe34e037a836fa807985c96fd69745cb1be3 100644
--- a/main/arpwatch/arpwatch.pre-install
+++ b/main/arpwatch/arpwatch.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -s /sbin/nologin -D -g arpwatch arpwatch 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/asterisk/asterisk.pre-install b/main/asterisk/asterisk.pre-install
index 935466dde0d016e502a98d248179ea54983e1d40..df228c28b6f1f1a1a2870c6aa43348bda545f21b 100644
--- a/main/asterisk/asterisk.pre-install
+++ b/main/asterisk/asterisk.pre-install
@@ -3,4 +3,5 @@
 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 781d5d88782c2b354a12ff80afce6793281a2f2c..02414e674baef0e7db19f7003763cc4406ca51c0 100644
--- a/main/asterisk/asterisk.pre-upgrade
+++ b/main/asterisk/asterisk.pre-upgrade
@@ -3,4 +3,5 @@
 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/atheme-iris/atheme-iris.pre-install b/main/atheme-iris/atheme-iris.pre-install
index 4198df244dd12da46573baac47850aba41f02c17..ef8ea56f517ab41cdd41eb90cd2f83b3d56161aa 100644
--- a/main/atheme-iris/atheme-iris.pre-install
+++ b/main/atheme-iris/atheme-iris.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -h /usr/share/webapps/atheme-iris -g iris -D -s /sbin/nologin iris >/dev/null
-exit 0
 
+exit 0
diff --git a/main/backuppc/backuppc.pre-install b/main/backuppc/backuppc.pre-install
index 32440ee678dd1459273d12a3dde4ddb4c3acc077..2ed220e00c8dde4db01e44998fd45d015c907f50 100644
--- a/main/backuppc/backuppc.pre-install
+++ b/main/backuppc/backuppc.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
-addgroup -S backuppc &>/dev/null
-adduser -S -h /var/lib/BackupPC -s /bin/sh -D -H -G backuppc -g "BackupPC user" backuppc &>/dev/null
+
+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
+
 exit 0
diff --git a/main/bacula-client/bacula-client.pre-install b/main/bacula-client/bacula-client.pre-install
index 7827de6015b7a2c22de5e71f10e935d87d1dae7d..363af9d96484af02db79f218517228d280c6f202 100644
--- a/main/bacula-client/bacula-client.pre-install
+++ b/main/bacula-client/bacula-client.pre-install
@@ -1,4 +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
+
 exit 0
diff --git a/main/bacula/bacula.pre-install b/main/bacula/bacula.pre-install
index 7827de6015b7a2c22de5e71f10e935d87d1dae7d..363af9d96484af02db79f218517228d280c6f202 100644
--- a/main/bacula/bacula.pre-install
+++ b/main/bacula/bacula.pre-install
@@ -1,4 +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
+
 exit 0
diff --git a/main/bind/bind.pre-install b/main/bind/bind.pre-install
index 116d51eec887261d0ef5f8eeeafec1b639ea7485..49e398b89f470c933127d0fa68470f5596164730 100644
--- a/main/bind/bind.pre-install
+++ b/main/bind/bind.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S named 2>/dev/null
 adduser -S -h /etc/bind -s /sbin/nologin -G named -D -g named named 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/charybdis/charybdis.pre-install b/main/charybdis/charybdis.pre-install
index 83ffff31285771f586715a28a459c1fe9787e08d..2dab19bc87c5e88f97344d42b3f8540806e1c983 100644
--- a/main/charybdis/charybdis.pre-install
+++ b/main/charybdis/charybdis.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 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 41e01c6ca99d068ed5d41ffbcc52ae10fdc23246..32b8fe3c3142c5ea211244037ea730a7a29c25e6 100644
--- a/main/chrony/chrony.pre-install
+++ b/main/chrony/chrony.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S 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 5ef833a7a670f26410d509f948c60dd83887b1e1..0442c39fa24d03026c7c45b6f14d6657831798d2 100644
--- a/main/clamav/clamav-daemon.pre-install
+++ b/main/clamav/clamav-daemon.pre-install
@@ -2,4 +2,5 @@
 
 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
+
 exit 0
diff --git a/main/clamav/clamav-db.pre-install b/main/clamav/clamav-db.pre-install
index f46eabe8b062750b6f4f04457199c416ed4a5b1f..b442a43cfd2c36957d7fd970c5764f22c0c3c64e 100644
--- a/main/clamav/clamav-db.pre-install
+++ b/main/clamav/clamav-db.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 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 5ef833a7a670f26410d509f948c60dd83887b1e1..0442c39fa24d03026c7c45b6f14d6657831798d2 100644
--- a/main/clamav/freshclam.pre-install
+++ b/main/clamav/freshclam.pre-install
@@ -2,4 +2,5 @@
 
 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
+
 exit 0
diff --git a/main/clamsmtp/clamsmtp.pre-install b/main/clamsmtp/clamsmtp.pre-install
index f46eabe8b062750b6f4f04457199c416ed4a5b1f..b442a43cfd2c36957d7fd970c5764f22c0c3c64e 100644
--- a/main/clamsmtp/clamsmtp.pre-install
+++ b/main/clamsmtp/clamsmtp.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 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 c673e278ec234dfd4ce049fdb33d4e9ab973738e..a58c16510004863fd903bfd320d1312b4b2bb773 100644
--- a/main/clamsmtp/clamsmtp.pre-upgrade
+++ b/main/clamsmtp/clamsmtp.pre-upgrade
@@ -11,4 +11,5 @@ if [ -f "$old" ] && [ ! -f "$new" ]; then
 fi
 
 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 15de617e5010cc672ef6ebfa22380fda17fab32e..65624f364c6f1be7ab2c180b6a530adb46beeef7 100644
--- a/main/coova-chilli/coova-chilli.pre-install
+++ b/main/coova-chilli/coova-chilli.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -s /sbin/nologin -D -g chilli chilli 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/cups/cups.pre-install b/main/cups/cups.pre-install
index 4b099d8a2699735b8c635e59c8ab96920257c7ff..cdb75cac56839111b71b07969c62aed3966a4a7c 100644
--- a/main/cups/cups.pre-install
+++ b/main/cups/cups.pre-install
@@ -4,4 +4,5 @@ addgroup -S lpadmin 2>/dev/null
 addgroup -S 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 b6981179abeb8ac4a524d436104cf22b1e4405c7..7cc6f41899d2ea80b9a9540ecff9e874c9122204 100644
--- a/main/cvechecker/cvechecker.pre-install
+++ b/main/cvechecker/cvechecker.pre-install
@@ -1,3 +1,6 @@
 #!/bin/sh
-addgroup -S cvechecker &>/dev/null
-adduser -S -g cvechecker cvechecker -h /var/cvechecker -DG cvechecker &>/dev/null
+
+addgroup -S cvechecker 2>/dev/null
+adduser -S -g cvechecker cvechecker -h /var/cvechecker -DG cvechecker 2>/dev/null
+
+exit 0
diff --git a/main/dansguardian/dansguardian.pre-install b/main/dansguardian/dansguardian.pre-install
index e897f8c83ce9e3693694e9fb7a82bf38c0ab8c33..201fdfc4089a603e5f577dc93bb5187f83821378 100644
--- a/main/dansguardian/dansguardian.pre-install
+++ b/main/dansguardian/dansguardian.pre-install
@@ -6,5 +6,6 @@ adduser -S -D -H \
 	-s /sbin/nologin \
 	-G dansguar \
 	-g dansguar \
-	dansguar 2>/dev/null || true
+	dansguar 2>/dev/null
 
+exit 0
diff --git a/main/dbus/dbus.pre-install b/main/dbus/dbus.pre-install
index 7fdb08a6912bc1411962780d7c9531ee53e5d66a..c736ea0b91accab72fb1b1a9d6d67ec40d91614f 100644
--- a/main/dbus/dbus.pre-install
+++ b/main/dbus/dbus.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S 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 5aaa6c4b7b625451b1dcb11c08b940d2098128e6..83ba7f045e30772406c337097879d1749a60d1ac 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
-exit 0
 
+exit 0
diff --git a/main/distcc/distcc.pre-install b/main/distcc/distcc.pre-install
index b408b4a12704c3c75f88df470c4c724caefb99e7..15d591dd1d2ae22dca042d0ad9f5c468c23e060e 100644
--- a/main/distcc/distcc.pre-install
+++ b/main/distcc/distcc.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S 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/djbdns/dnscache.pre-install b/main/djbdns/dnscache.pre-install
index 106fc292cb4f1da5d58561b7dc28489f00c53ddf..1b58fffa1cf99fed571ac114303b030d73d93a48 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
-exit 0
 
+exit 0
diff --git a/main/djbdns/tinydns.pre-install b/main/djbdns/tinydns.pre-install
index 8676fb4104aa1d49041b7f6e6466b14739f7aeea..094f0d8fc29370f6335024c08b080eadbfd71d8e 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
-exit 0
 
+exit 0
diff --git a/main/dnsmasq/dnsmasq.pre-install b/main/dnsmasq/dnsmasq.pre-install
index 43f60b8e6b3f1d719f57987794c8ab5d91c0e685..1263e54e0f92b59464b463e572a646aed6d99baa 100644
--- a/main/dnsmasq/dnsmasq.pre-install
+++ b/main/dnsmasq/dnsmasq.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S 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 481132bf70234fd910058cf556515657836ac7a6..d3c346867e2d426d76d3ab2063d26b09fcfd866a 100644
--- a/main/dovecot/dovecot.pre-install
+++ b/main/dovecot/dovecot.pre-install
@@ -2,4 +2,5 @@
 
 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 23d9faef7380ab127bd052d46332a5872445f042..b6b7e222132ce7c83e967ccbbcec3604489ea099 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
-exit 0
 
+exit 0
diff --git a/main/fetchmail/fetchmail.pre-install b/main/fetchmail/fetchmail.pre-install
index 67681f8edaaa12ac1be0faeb3d576917a2bc16d6..d9c1aed834c809d59674f566897059404952b27c 100644
--- a/main/fetchmail/fetchmail.pre-install
+++ b/main/fetchmail/fetchmail.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 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 f02c2c07bbe6e58935d72eccf72d5866dbb78459..8b0903272097544986c442fbf1ecf165bb5b0e72 100644
--- a/main/freeradius/freeradius.pre-install
+++ b/main/freeradius/freeradius.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S radius 2>/dev/null
 adduser -S -G radius -h /var/log/radius -s /sbin/nologin -D -g radius radius 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/gdnsd/gdnsd.pre-install b/main/gdnsd/gdnsd.pre-install
index 040e7f11df329e30e6ee70b09c20a9bed791cdbb..8e8af592f48cca8a4d080b5e13996e07beb64205 100644
--- a/main/gdnsd/gdnsd.pre-install
+++ b/main/gdnsd/gdnsd.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S 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 2d155abb288ef44e483f9b87f2cbe4339521c5b7..80a3a714c3503ab9ca3566a41260b0949c4e26d3 100644
--- a/main/gitolite/gitolite.pre-install
+++ b/main/gitolite/gitolite.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 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 81093a42a18bcfeb9d620ab1043c152ff552c36e..a66e2d903dbf8b49f6b731491557dbf74670ebe5 100644
--- a/main/gnats/gnats.pre-install
+++ b/main/gnats/gnats.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 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 d3a5f857bebe458721c6bea10149f2619402ee63..22fecf465e3ada175492f64a43ba468060012af1 100644
--- a/main/gross/gross.pre-install
+++ b/main/gross/gross.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 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 72b8ab0087a5f6cb594dec060baad53bd9a6d45f..162855ab33c47f41d5ff19034815628a78c41aca 100644
--- a/main/haproxy/haproxy.pre-install
+++ b/main/haproxy/haproxy.pre-install
@@ -10,3 +10,4 @@ if [ -e /etc/haproxy.cfg ] && ! [ -e /etc/haproxy/haproxy.cfg ]; then
 	mv /etc/haproxy.cfg /etc/haproxy/haproxy.cfg
 fi
 
+exit 0
diff --git a/main/haproxy/haproxy.pre-upgrade b/main/haproxy/haproxy.pre-upgrade
index 72b8ab0087a5f6cb594dec060baad53bd9a6d45f..162855ab33c47f41d5ff19034815628a78c41aca 100644
--- a/main/haproxy/haproxy.pre-upgrade
+++ b/main/haproxy/haproxy.pre-upgrade
@@ -10,3 +10,4 @@ if [ -e /etc/haproxy.cfg ] && ! [ -e /etc/haproxy/haproxy.cfg ]; then
 	mv /etc/haproxy.cfg /etc/haproxy/haproxy.cfg
 fi
 
+exit 0
diff --git a/main/icecast/icecast.pre-install b/main/icecast/icecast.pre-install
index 8734c1e13df00336b9246a1db03aaa245713fc8a..562611b666046d1fed5059aa847504bddd5bf0cb 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 -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 4f6144a95099427b7f55b48c6718e9d9758a87f4..2f08491d543c92a88311a75bae09d21db1f51e41 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
-exit 0
 
+exit 0
diff --git a/main/kamailio/kamailio.pre-install b/main/kamailio/kamailio.pre-install
index 19d11f5c2f11fca9fdb8981d1945410cbb1dedbd..e38239dd6f04da0a28ae0e1ec0bc0b6aa8956b81 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 -H -h /var/empty -s /sbin/nologin -D -G kamailio -g kamailio kamailio 2>/dev/null
 
 exit 0
diff --git a/main/libgphoto2/libgphoto2.pre-install b/main/libgphoto2/libgphoto2.pre-install
index a7d31448b8837cfce928497f59d47ca1fab2e9ff..c696fcdcaf128ed50659ea93767a5e2afd3507fa 100644
--- a/main/libgphoto2/libgphoto2.pre-install
+++ b/main/libgphoto2/libgphoto2.pre-install
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-if ! getent group camera >/dev/null; then
-	addgroup -S camera
-fi
+addgroup -S camera 2>/dev/null
 
+exit 0
diff --git a/main/libvirt/libvirt.post-install b/main/libvirt/libvirt.post-install
index 0be14b9e5877b6ca54164e8e97746fce4f200dcb..a7477012d3860327b144427fdfec0e59ea3637a5 100755
--- a/main/libvirt/libvirt.post-install
+++ b/main/libvirt/libvirt.post-install
@@ -1,3 +1,5 @@
 #!/bin/sh
-addgroup -S libvirt &>/dev/null
+
+addgroup -S libvirt 2>/dev/null
+
 exit 0
diff --git a/main/logcheck/logcheck.pre-install b/main/logcheck/logcheck.pre-install
index ea6028c49aa63695dd6d078ed1223b27f710de48..818fda5f02926ca4540c27c25b4ee7b344173f03 100644
--- a/main/logcheck/logcheck.pre-install
+++ b/main/logcheck/logcheck.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S 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 e4f16d2ddc082c323120cd71a1894039bb7f4219..14677b1fb60acce8cb206e1a27500061b3a85d07 100644
--- a/main/mariadb/mariadb.pre-install
+++ b/main/mariadb/mariadb.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S mysql 2>/dev/null
 adduser -S -h /var/lib/mysql -s /sbin/nologin -G mysql -D -g mysql mysql 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/memcached/memcached.pre-install b/main/memcached/memcached.pre-install
index df22cd5fdd582b80244bcd71572b37f36928e190..4440f4ee1a4dd86038355c1e55630a906c0fc6c6 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
-exit 0
 
+exit 0
diff --git a/main/minidlna/minidlna.pre-install b/main/minidlna/minidlna.pre-install
index 4423a73e6378387caedae61d6928d0716717295f..4fc20e601dd86cb3dc9c67f7e574e6f7484abd5a 100644
--- a/main/minidlna/minidlna.pre-install
+++ b/main/minidlna/minidlna.pre-install
@@ -3,4 +3,5 @@
 addgroup -S minidlna 2>/dev/null
 adduser -S -H -h /var/run/minidlna -s /sbin/nologin -D -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 046a821dc57e80376622dca1713171e54c956e9b..7a7b32c0fae2ae9a23e916f25f429103c38d2d24 100644
--- a/main/mlmmj/mlmmj.pre-install
+++ b/main/mlmmj/mlmmj.pre-install
@@ -2,4 +2,5 @@
 
 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
+
 exit 0
diff --git a/main/mosquitto/mosquitto.pre-install b/main/mosquitto/mosquitto.pre-install
index a0a8f7269bbb18582d03291f15184f6d4c3e9dfa..518d9f2443fc8fe9036dca009795ffc05731f205 100644
--- a/main/mosquitto/mosquitto.pre-install
+++ b/main/mosquitto/mosquitto.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S 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 7e012f89835827c6d60fb7c27eb93951a7baf92e..934307b65a27faef5cd75298982479c987987579 100644
--- a/main/mpd/mpd.pre-install
+++ b/main/mpd/mpd.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/mpd -s /sbin/nologin -G audio -D -g mpd mpd 2>/dev/null || true
+adduser -S -h /var/lib/mpd -s /sbin/nologin -G audio -D -g mpd mpd 2>/dev/null
+
+exit 0
diff --git a/main/mumble/murmur.pre-install b/main/mumble/murmur.pre-install
index cb0e0ebbaa534104fbfa99142c419157327805a4..980ed34a63d4b32327af6b1f7ea545df3d920ed8 100755
--- a/main/mumble/murmur.pre-install
+++ b/main/mumble/murmur.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
-addgroup -S murmur
-adduser -S -h /var/lib/murmur -s /sbin/nologin -G murmur -g "Mumble daemon" -H -D murmur
+
+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
+
 exit 0
diff --git a/main/nagios/nagios.pre-install b/main/nagios/nagios.pre-install
index d9c0f3c9f47968cf1df13108e76cb2841fe2692d..2e2dbbfa33cc100082dafc8b08e153e7ee084904 100644
--- a/main/nagios/nagios.pre-install
+++ b/main/nagios/nagios.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S 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/ngircd/ngircd.pre-install b/main/ngircd/ngircd.pre-install
index 036c9aba8dd2b29b11444d08c58fa70215db8435..bb5f05a03b4072299f682fd1cedfb4980fa0a60d 100644
--- a/main/ngircd/ngircd.pre-install
+++ b/main/ngircd/ngircd.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 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 7ee629b5874bfd5bb53708383f70d83e81b5cd8b..e00f960454fc38f6a0c997ec448e4d80bb56b248 100644
--- a/main/nrpe/nrpe.pre-install
+++ b/main/nrpe/nrpe.pre-install
@@ -2,4 +2,5 @@
 
 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 106ac00ccd7d001e5e7583747ed1a051414fc4fe..a94f6e083f2c8f4e7d636b4283e2ffb0298aed56 100644
--- a/main/nsd/nsd.pre-install
+++ b/main/nsd/nsd.pre-install
@@ -1,4 +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
+
 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 5a7076fa8a9b0bbd19fa07c1a8be8d22b59ef3f9..58b4216dc312e9b5ae8b0fa9a97614a481a106ab 100644
--- a/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
+++ b/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
@@ -6,4 +6,5 @@ groupname=$username
 addgroup -S $username 2>/dev/null
 adduser -S -H -h /var/run/$username -s /sbin/nologin -D -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 2386dc80698c0917109ca27b3871b19f38165647..9af92bb5d7d8146c7e44373b0bc634d130a3d13b 100755
--- a/main/ntop/ntop.pre-install
+++ b/main/ntop/ntop.pre-install
@@ -1,4 +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
+
 exit 0
diff --git a/main/open-vm-tools/open-vm-tools.pre-install b/main/open-vm-tools/open-vm-tools.pre-install
index 15fbca33b86ce899180e880c722aafdd3f5479db..39b485039076b834624a6861a1feb37736b981af 100644
--- a/main/open-vm-tools/open-vm-tools.pre-install
+++ b/main/open-vm-tools/open-vm-tools.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 addgroup -S vmware 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/openntpd/openntpd.pre-install b/main/openntpd/openntpd.pre-install
index 997e7bf8269e0a25de311164e865c3e92b1ffd9c..c3d9986a6555a5ac12c2c13ab8081f068f9460a1 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 -H -h /var/empty -s /sbin/nologin -D -g ntp ntp 2>/dev/null
 
 exit 0
diff --git a/main/opensmtpd/opensmtpd.pre-install b/main/opensmtpd/opensmtpd.pre-install
index af0620e3db171249695ca102a51b61d5ac461288..8cbebc19a082dfd4550c90e64514e181a6cafadb 100644
--- a/main/opensmtpd/opensmtpd.pre-install
+++ b/main/opensmtpd/opensmtpd.pre-install
@@ -2,10 +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
-
 mkdir -p /var/spool/mail
 
 exit 0
diff --git a/main/opentracker/opentracker.pre-install b/main/opentracker/opentracker.pre-install
index 2e591dbb9dead8e2b8711077806c74756f24b211..4a573b2733527ac53b401c18662ae2c0405c049a 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 -g opentracker opentracker 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/openvpn/openvpn.pre-install b/main/openvpn/openvpn.pre-install
index 37e0bf2532de9ab026a9ec94e5bba3d10c4c3cfe..ff553b811f571c28b412158876e5e09fa40f2b28 100644
--- a/main/openvpn/openvpn.pre-install
+++ b/main/openvpn/openvpn.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S 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 192e10e612511f7bd0d5a47b54c34185bf8416a8..2b9092985ab17a6c03bd1ade51905066790ae874 100644
--- a/main/pcsc-lite/pcsc-lite.pre-install
+++ b/main/pcsc-lite/pcsc-lite.pre-install
@@ -6,4 +6,5 @@ groupname=$username
 addgroup -S $username 2>/dev/null
 adduser -S -H -h /var/run/$username -s /sbin/nologin -D -G $groupname \
 	-g $username $username 2>/dev/null
+
 exit 0
diff --git a/main/pdnsd/pdnsd.pre-install b/main/pdnsd/pdnsd.pre-install
index b916dab59315436a16facaf6e2eb857da15640bb..164ef02a4444d1fb7bcfebe2994de4cabbc57fe6 100644
--- a/main/pdnsd/pdnsd.pre-install
+++ b/main/pdnsd/pdnsd.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 adduser -S -H -h /var/cache/pdnsd -s /sbin/nologin -g pdnsd pdnsd 2>/dev/null
+
 exit 0
diff --git a/main/postfix/postfix.pre-install b/main/postfix/postfix.pre-install
index 6a59570305c405063e4bec3e9d7a7b9cfcf1735b..d00c3eb1cd81f38763790e43507567904c1469f6 100644
--- a/main/postfix/postfix.pre-install
+++ b/main/postfix/postfix.pre-install
@@ -6,5 +6,4 @@ 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
 
-
 exit 0
diff --git a/main/postgrey/postgrey.pre-install b/main/postgrey/postgrey.pre-install
index e745acfa1a360b38a04bc3756a6a4a030f9fb02e..f70564c42f5e2c861a889b23ff9ef78aeb5cac8c 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 -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 72b4ac1774e20a6bcd202aa01bf7256359a6836a..3f6c75971f7f271cf88369d76d5fe8e7bb6a980c 100644
--- a/main/privoxy/privoxy.pre-install
+++ b/main/privoxy/privoxy.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S privoxy 2>/dev/null
 adduser -S -G privoxy -h /var/log/privoxy -s /sbin/nologin -D -g privoxy privoxy 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/qemu/qemu.pre-install b/main/qemu/qemu.pre-install
index d6449414cf96b62b6d70c30aee37c25df214d5ea..9aae4a407d2c1e489c2538d1f0bc696201cb176e 100644
--- a/main/qemu/qemu.pre-install
+++ b/main/qemu/qemu.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
 
-getent group kvm >/dev/null || addgroup -S -g 34 kvm
+addgroup -S -g 34 kvm 2>/dev/null
+
+exit 0
diff --git a/main/quagga-nhrp/quagga-nhrp.pre-install b/main/quagga-nhrp/quagga-nhrp.pre-install
index f8340fa26feef8133661e9379c756bc6b656e68e..f3b44716c34065b2060b9724a06d25bea6e73426 100644
--- a/main/quagga-nhrp/quagga-nhrp.pre-install
+++ b/main/quagga-nhrp/quagga-nhrp.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S quagga 2>/dev/null
 adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga -g quagga quagga 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/quagga/quagga.pre-install b/main/quagga/quagga.pre-install
index f8340fa26feef8133661e9379c756bc6b656e68e..f3b44716c34065b2060b9724a06d25bea6e73426 100644
--- a/main/quagga/quagga.pre-install
+++ b/main/quagga/quagga.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S quagga 2>/dev/null
 adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga -g quagga quagga 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/radvd/radvd.pre-install b/main/radvd/radvd.pre-install
index cc06c7d3e0e4ad6f18866843ea1a4a6fc1afe313..44c76a2e5e1a88cbc9aa1d7810066d5325ed8b27 100644
--- a/main/radvd/radvd.pre-install
+++ b/main/radvd/radvd.pre-install
@@ -1,5 +1,7 @@
 #!/bin/sh
+
 addgroup -S radvd 2>/dev/null
 adduser -S -s /sbin/nologin -D -H -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 2a5993426f79e3671cf53c3a398e401ba89f3aa8..b6cbd05a13c663a03c9654ce398b87f0fe4a8f5d 100644
--- a/main/redis/redis.pre-install
+++ b/main/redis/redis.pre-install
@@ -2,4 +2,5 @@
 
 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
+
 exit 0
diff --git a/main/rpcbind/rpcbind.pre-install b/main/rpcbind/rpcbind.pre-install
index 51fae454042d1ab9044476a01f61d2ea3f5a61a4..fe6a8268dfb16e07cd38b7080a6d4b2ce8b58efd 100644
--- a/main/rpcbind/rpcbind.pre-install
+++ b/main/rpcbind/rpcbind.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S 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/rt4/rt4.pre-install b/main/rt4/rt4.pre-install
index b62454d6d0edb53594a1c72fef92ddc3f09965b1..88327830ab722a348b40b72cf65683366ea399b0 100644
--- a/main/rt4/rt4.pre-install
+++ b/main/rt4/rt4.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S rt4 2>/dev/null
 adduser -S -s /sbin/nologin -G rt4 -D -H -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 faf0431225c0ffb87dc9299401aee00e7d7a1da5..ec21795914d947cf177cc4479783d80416aada8e 100644
--- a/main/rtnppd/rtnppd.pre-install
+++ b/main/rtnppd/rtnppd.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S 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 cbf1e527c9c109977eaa1b7f25c53414a30d4c1d..93a10a866fad540b7903f9ca5580afc0b094cf9b 100644
--- a/main/rtpproxy/rtpproxy.pre-install
+++ b/main/rtpproxy/rtpproxy.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S 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 b3b5c780247fa52ac8ce53067a5c5bfb3403c077..83d4f74068208bd63bc1b9a581be90ae701cef10 100644
--- a/main/sems/sems.pre-install
+++ b/main/sems/sems.pre-install
@@ -1,10 +1,6 @@
 #!/bin/sh
 
-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 -g sems sems 2>/dev/null
-fi
+addgroup -S sems 2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -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 8bfedcc9c357652a93c16743b62d7b598fa5af62..c9db4723fe44b6ae708a51f90be6a57ccebc6b99 100644
--- a/main/sircbot/sircbot.pre-install
+++ b/main/sircbot/sircbot.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S 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 3158cc40ad35f611fb6350dc5b4dec527ee668a3..f13ff10901f404d84b72dec29b2ff09e26748989 100644
--- a/main/smokeping/smokeping.pre-install
+++ b/main/smokeping/smokeping.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S 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 efc8a6e05f6977ff1a5d778ba51cd1fe803c5d85..e0c65c802065cfab682922ffde40a0a87e9d7719 100644
--- a/main/snmptt/snmptt.pre-install
+++ b/main/snmptt/snmptt.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
-adduser -S -h /var/spool/snmptt -s /sbin/nologin -D -g snmptt snmptt &>/dev/null
+
+adduser -S -h /var/spool/snmptt -s /sbin/nologin -D -g snmptt snmptt 2>/dev/null
+
 exit 0
diff --git a/main/snort/snort.pre-install b/main/snort/snort.pre-install
index 47608ed97b73c475f95d98cfb15b7abf1c9ce570..bd0791bab21d242fb818def95d707086ec0a7fb7 100644
--- a/main/snort/snort.pre-install
+++ b/main/snort/snort.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 adduser -S -h /var/log/snort -s /sbin/nologin -D -g snort snort 2>/dev/null
+
 exit 0
diff --git a/main/squark/squark.post-install b/main/squark/squark.post-install
index 3c4069469258f2623d16184952a6a3f00183e034..f4f87982fb99d5bcebdbd09514909e89b36ca01f 100755
--- a/main/squark/squark.post-install
+++ b/main/squark/squark.post-install
@@ -1,2 +1,5 @@
 #!/bin/sh
-addgroup -S squark &>/dev/null || exit 0
+
+addgroup -S squark 2>/dev/null
+
+exit 0
diff --git a/main/squid/squid.pre-install b/main/squid/squid.pre-install
index 3ac1f9fa161e5366128623478fdb43902fd16929..11ff2bc3d954d23c5c8653d9f70ec232a613e041 100644
--- a/main/squid/squid.pre-install
+++ b/main/squid/squid.pre-install
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-adduser -S -D -g squid 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
+addgroup squid winbind 2>/dev/null
+
 exit 0
diff --git a/main/squid/squid.pre-upgrade b/main/squid/squid.pre-upgrade
index 3ac1f9fa161e5366128623478fdb43902fd16929..11ff2bc3d954d23c5c8653d9f70ec232a613e041 100644
--- a/main/squid/squid.pre-upgrade
+++ b/main/squid/squid.pre-upgrade
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-adduser -S -D -g squid 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
+addgroup squid winbind 2>/dev/null
+
 exit 0
diff --git a/main/strongswan/strongswan.pre-install b/main/strongswan/strongswan.pre-install
index 12371d1196d2d3a97ac6556c38cb532fc5b2a6b4..83b93284a153580b9d26a2b9c6a700457bc82f91 100644
--- a/main/strongswan/strongswan.pre-install
+++ b/main/strongswan/strongswan.pre-install
@@ -1,10 +1,6 @@
 #!/bin/sh
 
-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 -g ipsec ipsec 2>/dev/null
-fi
+addgroup -S ipsec 2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -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 31090069b37a529d38281c7eea75dfecc71abba5..955baeefbd6a817782ea7750895c95642715d5f2 100644
--- a/main/subversion/subversion.pre-install
+++ b/main/subversion/subversion.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S svnusers 2>/dev/null
 adduser -S -g svn svn -D -h /var/svn -G svnusers 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/trac/trac.pre-install b/main/trac/trac.pre-install
index 0fa8f02aa060fa553cd4e40f77b9c058d4af5631..05e9f2a448070eebdb7438603a60823264c77c87 100644
--- a/main/trac/trac.pre-install
+++ b/main/trac/trac.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S 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/umurmur/umurmur.post-install b/main/umurmur/umurmur.post-install
index d9a350a78a62d2d312ef562e37e8ce58a38b07b4..771aed1c8ece2bacd33a1a721064bc864c3e815c 100755
--- a/main/umurmur/umurmur.post-install
+++ b/main/umurmur/umurmur.post-install
@@ -1,4 +1,6 @@
 #!/bin/sh
-addgroup -S umurmur &>/dev/null
-adduser -S -s /bin/false -G umurmur -h /var/run/umurmurd -D -g umurmur umurmur &>/dev/null
+
+addgroup -S umurmur 2>/dev/null
+adduser -S -s /bin/false -G umurmur -h /var/run/umurmurd -D -g umurmur umurmur 2>/dev/null
+
 exit 0
diff --git a/main/unbound/unbound.pre-install b/main/unbound/unbound.pre-install
index 4cd64d59c6802cdf6b8a45c015a03f7dfe292ab6..63c00e9cdc607433941f03e62efb0ca95291a4b1 100644
--- a/main/unbound/unbound.pre-install
+++ b/main/unbound/unbound.pre-install
@@ -3,4 +3,5 @@
 addgroup -S unbound 2>/dev/null
 adduser -S -s /sbin/nologin -D -H -h /etc/unbound -G unbound \
 	-g "Unbound user" unbound 2>/dev/null
+
 exit 0
diff --git a/main/uvncrepeater/uvncrepeater.pre-install b/main/uvncrepeater/uvncrepeater.pre-install
index 0c856f813d2fd3cb129c20b87ddf25e144de8c8d..052cd7ff22a8bc6070f7bbcb4411dde0e4dbc9e8 100644
--- a/main/uvncrepeater/uvncrepeater.pre-install
+++ b/main/uvncrepeater/uvncrepeater.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 adduser -S -D -g uvncrep uvncrep 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/varnish/varnish.pre-install b/main/varnish/varnish.pre-install
index 74ccfd14218f98f36217ccb6681c65edb0f64a77..4e34a099c7246956213c8dfdbde7b34bde6856f6 100644
--- a/main/varnish/varnish.pre-install
+++ b/main/varnish/varnish.pre-install
@@ -2,4 +2,5 @@
 
 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
+
 exit 0
diff --git a/main/vlc/vlc-daemon.pre-install b/main/vlc/vlc-daemon.pre-install
index 33f99df87093ceb26622b22b8cf304041769f39b..778c27a8c3a84454005da7ded7e6526f591ba4b8 100644
--- a/main/vlc/vlc-daemon.pre-install
+++ b/main/vlc/vlc-daemon.pre-install
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 groups="vlc audio video"
+
 for group in $groups; do
 	addgroup -S $group 2>/dev/null
 done
@@ -10,4 +11,5 @@ adduser -S -h /home/vlc -s /bin/sh -G vlc -D -g vlc vlc 2>/dev/null
 for group in $groups; do
 	addgroup vlc $group 2>/dev/null
 done
+
 exit 0
diff --git a/main/vsftpd/vsftpd.pre-install b/main/vsftpd/vsftpd.pre-install
index 0ed59d906a3a192f22f707d83eb340044a398fe4..c6e45f1b71a68e3bdf10c7cdfdc9bb96d637ee17 100755
--- a/main/vsftpd/vsftpd.pre-install
+++ b/main/vsftpd/vsftpd.pre-install
@@ -1,5 +1,7 @@
 #!/bin/sh
-addgroup -S ftp &>/dev/null
-addgroup vsftp ftp &>/dev/null
-adduser -S -h /var/lib/ftp -s /sbin/nologin -G ftp -g vsftp vsftp &>/dev/null
+
+addgroup -S ftp 2>/dev/null
+addgroup vsftp ftp 2>/dev/null
+adduser -S -h /var/lib/ftp -s /sbin/nologin -G ftp -g vsftp vsftp 2>/dev/null
+
 exit 0
diff --git a/main/ympd/ympd.pre-install b/main/ympd/ympd.pre-install
index 369f25d94593bd6b4d73f2b09cca2a05c40fbc2b..a9a6edb409bc0143d89c7e08dc5d82e28c1ba39b 100644
--- a/main/ympd/ympd.pre-install
+++ b/main/ympd/ympd.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 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 a63d884e025e2b497149b4ab99cc4c1f47ef2f30..7cc5be2f89680bbe7d221cf17cbfa282e4a27abd 100644
--- a/main/zabbix/zabbix-agent.pre-install
+++ b/main/zabbix/zabbix-agent.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S 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 30851f153c81bd54e12110eeb3b3388fb69cbd5f..7cc5be2f89680bbe7d221cf17cbfa282e4a27abd 100644
--- a/main/zabbix/zabbix.pre-install
+++ b/main/zabbix/zabbix.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S 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 c0e1fa5f6b26db749d200ccb68ce79c3f5c30251..17c3bbc6944e8c256c576c1791754ce37b9dbfc4 100644
--- a/main/znc/znc.pre-install
+++ b/main/znc/znc.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -D -s /sbin/nologin -g znc znc 2>/dev/null
+
 exit 0
diff --git a/testing/3proxy/3proxy.pre-install b/testing/3proxy/3proxy.pre-install
index 46e6ea557dc283d9ca62284f227b94737bc64bee..c314228962431e3016738f2cd10ee2e61c57a087 100644
--- a/testing/3proxy/3proxy.pre-install
+++ b/testing/3proxy/3proxy.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S 3proxy 2>/dev/null
 adduser -S -G 3proxy -h /var/log/3proxy -s /sbin/nologin -D -g 3proxy 3proxy 2>/dev/null
-exit 0
 
+exit 0
diff --git a/testing/at/at.pre-install b/testing/at/at.pre-install
index a35aa484c9c9ea5941104c0f5e306ca2390aab42..e3c28ec89805522beea97409b18087c5085d43ac 100644
--- a/testing/at/at.pre-install
+++ b/testing/at/at.pre-install
@@ -1,16 +1,7 @@
 #!/bin/sh
 
-if ! getent group at >/dev/null; then
-	addgroup -S at 2>/dev/null
-fi
-
-if ! getent passwd at >/dev/null; then
-	adduser -S -H -s /bin/false -D -g at at 2>/dev/null
-fi
-
-if [ -z `echo " $(groups at) " | grep ' at '`] ; then
-	addgroup at at 2>/dev/null
-fi
+addgroup -S at 2>/dev/null
+adduser -S -H -s /bin/false -D -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 f020a8bd73437cf7edf8867efb2eedc6795e0c8b..9cf75bbfb7322662e24a2c0d28877d8f545978f8 100644
--- a/testing/bitcoin/bitcoin.pre-install
+++ b/testing/bitcoin/bitcoin.pre-install
@@ -1,5 +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
-exit 0
 
+exit 0
diff --git a/testing/buildbot-slave/buildbot-slave.pre-install b/testing/buildbot-slave/buildbot-slave.pre-install
index 40e29454cb86364e497e36e12e186595a6fe996b..ca33aace548ee4d9fd297897c0f1ece04d992283 100644
--- a/testing/buildbot-slave/buildbot-slave.pre-install
+++ b/testing/buildbot-slave/buildbot-slave.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
-exit 0
 
+exit 0
diff --git a/testing/buildbot/buildbot.pre-install b/testing/buildbot/buildbot.pre-install
index 40e29454cb86364e497e36e12e186595a6fe996b..ca33aace548ee4d9fd297897c0f1ece04d992283 100644
--- a/testing/buildbot/buildbot.pre-install
+++ b/testing/buildbot/buildbot.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
-exit 0
 
+exit 0
diff --git a/testing/clapf/clapf.pre-install b/testing/clapf/clapf.pre-install
index dff8c72c5348e1065de2ec8c7ff780cacd7a5e50..eec8afe4f2cd878a649f8f8f7811d880f2fc182f 100644
--- a/testing/clapf/clapf.pre-install
+++ b/testing/clapf/clapf.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -s /bin/false -D -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 2dff6b28b82044f210a7707a5f307bbd963e462d..ce20da41023f873e3dd57f1af76f17606530653f 100644
--- a/testing/cluster-glue/cluster-glue.pre-install
+++ b/testing/cluster-glue/cluster-glue.pre-install
@@ -8,4 +8,3 @@ adduser -S -g hacluster hacluster \
 	2>/dev/null
 
 exit 0
-
diff --git a/testing/consul/consul.pre-install b/testing/consul/consul.pre-install
index 4d7a38506c1dfbaf666d333848c68c560c54803c..1b9ea9daab91a363281f401a58f4c15000cb71b9 100644
--- a/testing/consul/consul.pre-install
+++ b/testing/consul/consul.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # 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
-exit 0
+addgroup -S consul 2>/dev/null
+adduser -S -h /var/consul -s /sbin/nologin -G consul -D -g consul consul 2>/dev/null
 
+exit 0
diff --git a/testing/crtmpserver/crtmpserver.pre-install b/testing/crtmpserver/crtmpserver.pre-install
index 643a6f8ff1af438a394c4de11a5fa58657b15ce9..e8dc1c722b688109c09206026a3b8714490f83c2 100644
--- a/testing/crtmpserver/crtmpserver.pre-install
+++ b/testing/crtmpserver/crtmpserver.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -h /var/crtmpserver -s /bin/false -g rtmpd rtmpd 2>/dev/null
+
 exit 0
diff --git a/testing/dante/dante-server.pre-install b/testing/dante/dante-server.pre-install
index f657308493bb4f10e8e85824030fd99dafe9ce35..d11b1637c77b121b79255b78ddf7781266c7a029 100644
--- a/testing/dante/dante-server.pre-install
+++ b/testing/dante/dante-server.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S sockd 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -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 005bd35caba1e84d0693e54da4ec8bc0fb64f99d..3d4786e0ad54513c1b790a49eed8fc162bd31b06 100644
--- a/testing/darwin-streaming-server/darwin-streaming-server.post-install
+++ b/testing/darwin-streaming-server/darwin-streaming-server.post-install
@@ -1,4 +1,6 @@
 #!/bin/sh
-addgroup -S qtss &>/dev/null
-adduser -S -s /bin/false -G qtss -h /var/darwinstreaming -D -g qtss qtss &>/dev/null
+
+addgroup -S qtss 2>/dev/null
+adduser -S -s /bin/false -G qtss -h /var/darwinstreaming -D -g qtss qtss 2>/dev/null
+
 exit 0
diff --git a/testing/dbmail/dbmail.pre-install b/testing/dbmail/dbmail.pre-install
index 1f650df7c6a8260f744d8e1ffb100a34df024b34..bca9a6fe487590993d5b65adb22fde27c28d783d 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
-exit 0
 
+exit 0
diff --git a/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install b/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
index 3bee7f2fff2d71585e00387aae600d2cdfa5afa5..34a4de62f094690856d09dc1fa6756f940fbbf7b 100644
--- a/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
+++ b/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
@@ -1,4 +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
+
 exit 0
diff --git a/testing/drizzle/drizzle.post-install b/testing/drizzle/drizzle.post-install
index e7c7dcb49adcf043d5d3880681905a662c154f30..64016b23f8ca3dad01a3a7689803c94b19cc478a 100644
--- a/testing/drizzle/drizzle.post-install
+++ b/testing/drizzle/drizzle.post-install
@@ -1,2 +1,6 @@
-addgroup -S drizzle
-adduser -SDHG drizzle -g drizzle drizzle
+#!/bin/sh
+
+addgroup -S drizzle 2>/dev/null
+adduser -SDHG drizzle -g drizzle drizzle 2>/dev/null
+
+exit 0
diff --git a/testing/dspam/dspam.pre-install b/testing/dspam/dspam.pre-install
index d06ab90b5e23ac4205428b40ff4b568370df0ba7..e7a059cbb467945cd677d999adb4bb0614d74f9a 100644
--- a/testing/dspam/dspam.pre-install
+++ b/testing/dspam/dspam.pre-install
@@ -2,5 +2,5 @@
 
 adduser -S -h /var/lib/dspam -s /bin/false -D -g dspam dspam 2>/dev/null
 chown dspam:dspam /var/lib/dspam
-exit 0
 
+exit 0
diff --git a/testing/ejabberd/ejabberd.pre-install b/testing/ejabberd/ejabberd.pre-install
index d4cab3c0a6a5295176b571cd9b97153b9670029f..efda04bed68ef063c474125dfd670548e69e44ba 100644
--- a/testing/ejabberd/ejabberd.pre-install
+++ b/testing/ejabberd/ejabberd.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
-adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -g ejabberd ejabberd  2>/dev/null
+
+adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -g ejabberd ejabberd 2>/dev/null
+
 exit 0
diff --git a/testing/elasticsearch/elasticsearch.pre-install b/testing/elasticsearch/elasticsearch.pre-install
index 63e023a16a850cd77eb85ad9fc4e42d8b1135b78..54cd0d8f1310500e9a48ba08f17416af5757b4b1 100644
--- a/testing/elasticsearch/elasticsearch.pre-install
+++ b/testing/elasticsearch/elasticsearch.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-addgroup -S elastico
+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
+	-g "added by apk for elasticsearch" -DH elastico 2>/dev/null
 
 exit 0
diff --git a/testing/emby/emby.pre-install b/testing/emby/emby.pre-install
index cfe59652f62825d941762e9a9c488a9206803b8b..70555e47b8c165773e35915216567ccb658b9a5b 100644
--- a/testing/emby/emby.pre-install
+++ b/testing/emby/emby.pre-install
@@ -1,5 +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
+
 exit 0
diff --git a/testing/fcron/fcron.pre-install b/testing/fcron/fcron.pre-install
index d513ffdef169a25cca91473ffa291aeaa49441f9..d4d66fdda2695135d2b78a8c9f5da980be74e13f 100644
--- a/testing/fcron/fcron.pre-install
+++ b/testing/fcron/fcron.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
-adduser -S -D -g fcron fcron -H -s /sbin/nologin  2>/dev/null
-addgroup -S fcron
+
+adduser -S -D -g fcron fcron -H -s /sbin/nologin 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 040e7f11df329e30e6ee70b09c20a9bed791cdbb..8e8af592f48cca8a4d080b5e13996e07beb64205 100644
--- a/testing/gdnsd/gdnsd.pre-install
+++ b/testing/gdnsd/gdnsd.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S 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/testing/gogs/gogs.pre-install b/testing/gogs/gogs.pre-install
index 1596d6569343121b94a75327fa36684b64370921..b1d3258c919321986a60c717036b1331f89f9d02 100644
--- a/testing/gogs/gogs.pre-install
+++ b/testing/gogs/gogs.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/gogs -s /bin/ash -G www-data -D -g gogs gogs 2>/dev/null || true
-passwd -u gogs || true
+adduser -S -h /var/lib/gogs -s /bin/ash -G www-data -D -g gogs gogs 2>/dev/null
+passwd -u gogs 2>/dev/null
+
+exit 0
diff --git a/testing/lightdm/lightdm.pre-install b/testing/lightdm/lightdm.pre-install
index b8dbf564bbfdb6508fe4565723fb31332417d9e1..b7efe57975a550b40f8f3bf9778148709e18e583 100644
--- a/testing/lightdm/lightdm.pre-install
+++ b/testing/lightdm/lightdm.pre-install
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 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
+
 exit 0
diff --git a/testing/lizardfs/lizardfs.pre-install b/testing/lizardfs/lizardfs.pre-install
index f302e851e1b7e420582053f4bd23c9b8a5538ad6..e4b14a6197ad1744e88aa8e29cb8930cd936f9be 100644
--- a/testing/lizardfs/lizardfs.pre-install
+++ b/testing/lizardfs/lizardfs.pre-install
@@ -3,4 +3,5 @@
 addgroup -S mfs 2>/dev/null
 adduser -S -H -h /var/lib/mfs -s /sbin/nologin -D -G mfs -g mfs mfs \
 	2>/dev/null
+
 exit 0
diff --git a/testing/lshell/lshell.pre-install b/testing/lshell/lshell.pre-install
index 89e31b2010295614576f7433c22cb02e0ada683a..8aedffa5339d846fb643457d781655b5c097ff86 100644
--- a/testing/lshell/lshell.pre-install
+++ b/testing/lshell/lshell.pre-install
@@ -1,4 +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
+
 exit 0
diff --git a/testing/lusca/lusca.pre-install b/testing/lusca/lusca.pre-install
index 72953cfb25b2c0238f46e9e6cc496cf55df8495a..f70964f97e2e6def063989322dae6cf98330b837 100644
--- a/testing/lusca/lusca.pre-install
+++ b/testing/lusca/lusca.pre-install
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin  2>/dev/null
+adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin 2>/dev/null
 addgroup -S winbind 2>/dev/null
-addgroup lusca winbind
+addgroup lusca winbind 2>/dev/null
+
 exit 0
diff --git a/testing/lusca/lusca.pre-upgrade b/testing/lusca/lusca.pre-upgrade
index 72953cfb25b2c0238f46e9e6cc496cf55df8495a..f70964f97e2e6def063989322dae6cf98330b837 100644
--- a/testing/lusca/lusca.pre-upgrade
+++ b/testing/lusca/lusca.pre-upgrade
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin  2>/dev/null
+adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin 2>/dev/null
 addgroup -S winbind 2>/dev/null
-addgroup lusca winbind
+addgroup lusca winbind 2>/dev/null
+
 exit 0
diff --git a/testing/milter-greylist/milter-greylist.pre-install b/testing/milter-greylist/milter-greylist.pre-install
index f5e5359e86fa18fca36e136fdc3152069a11b62f..c104db9a74e549caa73aa2f44360398e8de4000c 100644
--- a/testing/milter-greylist/milter-greylist.pre-install
+++ b/testing/milter-greylist/milter-greylist.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
-addgroup -S smmsp &>/dev/null
-adduser -h /var/lib/milter-greylist -s /sbin/nologin -S -G smmsp -g smmsp smmsp &>/dev/null
+
+addgroup -S smmsp 2>/dev/null
+adduser -h /var/lib/milter-greylist -s /sbin/nologin -S -G smmsp -g smmsp smmsp 2>/dev/null
+
 exit 0
diff --git a/testing/mlocate/mlocate.pre-install b/testing/mlocate/mlocate.pre-install
index 18aa121d07b61300f2cd0c5b2d0d7dbb99f7ffa7..8ae6bbd550878792e6a21b6c281520f903f1aa6a 100644
--- a/testing/mlocate/mlocate.pre-install
+++ b/testing/mlocate/mlocate.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 addgroup -S locate 2>/dev/null
+
 exit 0
diff --git a/testing/mongodb/mongodb.pre-install b/testing/mongodb/mongodb.pre-install
index 93c85ecf5c3e40d498634aa6931aaa2d61680c02..12b09a19696f996c4f6e0b06c7e5a288c3044c09 100644
--- a/testing/mongodb/mongodb.pre-install
+++ b/testing/mongodb/mongodb.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-addgroup -S mongodb
-adduser -S -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin -g mongodb mongodb
+addgroup -S mongodb 2>/dev/null
+adduser -S -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin -g mongodb mongodb 2>/dev/null
+
 exit 0
diff --git a/testing/motion/motion.pre-install b/testing/motion/motion.pre-install
index 7e66ab0e20bece5aee3bf49331b7131d5bad1bfe..91a4c34c0163b9770b25458f9deea70c1f64dd84 100644
--- a/testing/motion/motion.pre-install
+++ b/testing/motion/motion.pre-install
@@ -1,6 +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
-addgroup motion video
-exit 0
+addgroup motion video 2>/dev/null
 
+exit 0
diff --git a/testing/namecoin/namecoin.pre-install b/testing/namecoin/namecoin.pre-install
index 33c72d1463470fed5ed2056e9e9c6186a70d7934..530d027236a7d94129016dbcba73f65732b06709 100644
--- a/testing/namecoin/namecoin.pre-install
+++ b/testing/namecoin/namecoin.pre-install
@@ -1,5 +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
-exit 0
 
+exit 0
diff --git a/testing/ntopng/ntopng.pre-install b/testing/ntopng/ntopng.pre-install
index 2386dc80698c0917109ca27b3871b19f38165647..9af92bb5d7d8146c7e44373b0bc634d130a3d13b 100755
--- a/testing/ntopng/ntopng.pre-install
+++ b/testing/ntopng/ntopng.pre-install
@@ -1,4 +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
+
 exit 0
diff --git a/testing/nut/nut.pre-install b/testing/nut/nut.pre-install
index cea4d7f5a81d8c4566a4dac86556cd4a9e30b1b1..707f98d53ab556a99f7f1ef07ff91eafdec177f5 100644
--- a/testing/nut/nut.pre-install
+++ b/testing/nut/nut.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 adduser nut uucp 2>/dev/null
+
 exit 0
diff --git a/testing/opennebula/opennebula-node-kvm.pre-install b/testing/opennebula/opennebula-node-kvm.pre-install
index 5cf97eebc98cbf6c183a1958aefe8770ebcd4a16..73173a745eff476bf8c8a6db8491308ba7bb277a 100644
--- a/testing/opennebula/opennebula-node-kvm.pre-install
+++ b/testing/opennebula/opennebula-node-kvm.pre-install
@@ -8,5 +8,6 @@ adduser -S -D -s /bin/ash \
 addgroup oneadmin libvirt 2>/dev/null
 addgroup oneadmin readproc 2>/dev/null
 addgroup oneadmin kvm 2>/dev/null
-passwd -u oneadmin &>/dev/null
+passwd -u oneadmin 2>/dev/null
+
 exit 0
diff --git a/testing/opennebula/opennebula.pre-install b/testing/opennebula/opennebula.pre-install
index e59e4144298751c7cb2e87215ad512ab0e413dd9..15527ebc01f1e6d3adfacbf8566c0f57c6f5f969 100644
--- a/testing/opennebula/opennebula.pre-install
+++ b/testing/opennebula/opennebula.pre-install
@@ -4,5 +4,6 @@ addgroup -S oneadmin 2>/dev/null
 adduser -S -D -s /bin/ash \
 	-H -h /var/lib/one -G oneadmin \
 	-g "OpenNebula user" oneadmin 2>/dev/null
-passwd -u oneadmin &>/dev/null
+passwd -u oneadmin 2>/dev/null
+
 exit 0
diff --git a/testing/opensips/opensips.pre-install b/testing/opensips/opensips.pre-install
index 9ef4702b978c155e7cd7e6c08cf21de3bac4e26d..8d0774990b6bc426a6062ab7f50071ae6e009a9b 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 -H -h /var/empty -s /bin/false -D -g opensips opensips 2>/dev/null
 
 exit 0
diff --git a/testing/openxcap/openxcap.pre-install b/testing/openxcap/openxcap.pre-install
index 44ad1065e1c13666b76717d1cc9422995e7975d8..7c90e2775c155530fbf5b2b89e1bdca4dd844cbf 100755
--- a/testing/openxcap/openxcap.pre-install
+++ b/testing/openxcap/openxcap.pre-install
@@ -2,4 +2,5 @@
 
 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
+
 exit 0
diff --git a/testing/pdns/pdns.pre-install b/testing/pdns/pdns.pre-install
index e0b3c5ac682e89202ddcc1fbb8d1efd0e58ec0d6..bf00793e47e8d2718fad122b6af42602eb820cc1 100644
--- a/testing/pdns/pdns.pre-install
+++ b/testing/pdns/pdns.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 adduser -S -H -h /var/empty -D -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 e2fab2127b2b284531cb698f2d315c708bf21d3f..c15127d59db4cd39626812e516a7dfade3c74a2f 100644
--- a/testing/prosody/prosody.pre-install
+++ b/testing/prosody/prosody.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 addgroup -S prosody 2>/dev/null
 adduser -S -D \
 	-h /var/lib/prosody \
@@ -6,4 +7,5 @@ adduser -S -D \
 	-g "Prosody XMPP Server" \
     -G prosody \
 	prosody 2>/dev/null
+
 exit 0
diff --git a/testing/qpage/qpage.pre-install b/testing/qpage/qpage.pre-install
index aaa8d3e59ac0c4b24c0d5b8be5306822b7c0065f..5e7eed0842c606c293ab24ea2505708177193502 100644
--- a/testing/qpage/qpage.pre-install
+++ b/testing/qpage/qpage.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/qpage -s /bin/false -G qpage -D -g qpage qpage 2>/dev/null || true
+adduser -S -h /var/lib/qpage -s /bin/false -G qpage -D -g qpage qpage 2>/dev/null
+
+exit 0
diff --git a/testing/quicktun/quicktun.pre-install b/testing/quicktun/quicktun.pre-install
index c17d220e20569336dce073aebcc0a6cbd350fa88..b3c4c5088b95f98985e50e79f5c7ea390a7cb994 100755
--- a/testing/quicktun/quicktun.pre-install
+++ b/testing/quicktun/quicktun.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
-addgroup -S quicktun
-adduser -S -h /var/run/quicktun -s /sbin/nologin -G quicktun -g "quicktun user" -H -D quicktun
-exit 0
 
+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
+
+exit 0
diff --git a/testing/radicale/radicale.pre-install b/testing/radicale/radicale.pre-install
index f101c38153d97fe559217cf7afafcb6e9826d98e..c15cf63cc47c9c98b3f34d7bc527505b4c943c1e 100644
--- a/testing/radicale/radicale.pre-install
+++ b/testing/radicale/radicale.pre-install
@@ -1,7 +1,9 @@
 #!/bin/sh
 
 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
 addgroup $name $name 2>/dev/null
+
 exit 0
diff --git a/testing/rancid/rancid.pre-install b/testing/rancid/rancid.pre-install
index 7204ea3fcb8f9ea0708845582b4e1b070ea33bcd..51e0dc84e7431634fc726279dff3a7ab597a676e 100644
--- a/testing/rancid/rancid.pre-install
+++ b/testing/rancid/rancid.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S netadm 2>/dev/null
 adduser -S -h /var/rancid -s /bin/sh -G netadm -D -g rancid rancid 2>/dev/null
+
 exit 0
diff --git a/testing/rrdbot/rrdbot.pre-install b/testing/rrdbot/rrdbot.pre-install
index 291f9182a5c635c18da1c2b3c34c0d2a221a7017..7004829ad7e1207590cd2d7ebc4bd805b135636d 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 -H -s /bin/false -D -g rrdbotd rrdbotd 2>/dev/null
 
 exit 0
diff --git a/testing/rutorrent/rutorrent.pre-install b/testing/rutorrent/rutorrent.pre-install
index 0d814556e4f41e6438368e87aa0a9d12e8ff82ce..2c539f62fd28b116a61d7bc79fc511ab4da78c45 100644
--- a/testing/rutorrent/rutorrent.pre-install
+++ b/testing/rutorrent/rutorrent.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 addgroup -S rutorrent 2>/dev/null
-exit 0
 
+exit 0
diff --git a/testing/sipwise-sems/sipwise-sems.pre-install b/testing/sipwise-sems/sipwise-sems.pre-install
index b3b5c780247fa52ac8ce53067a5c5bfb3403c077..83d4f74068208bd63bc1b9a581be90ae701cef10 100644
--- a/testing/sipwise-sems/sipwise-sems.pre-install
+++ b/testing/sipwise-sems/sipwise-sems.pre-install
@@ -1,10 +1,6 @@
 #!/bin/sh
 
-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 -g sems sems 2>/dev/null
-fi
+addgroup -S sems 2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -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 3f1b8a31dd73099481e483a6c8a45ebeb3f7e430..a663d3dc325bd8c6a8f0a7dd6dfff3870bb8e25f 100644
--- a/testing/socklog/socklog.post-install
+++ b/testing/socklog/socklog.post-install
@@ -19,3 +19,4 @@ exec chpst -Unobody socklog unix /dev/log
 EOF
 fi
 
+exit 0
diff --git a/testing/stunnel/stunnel.pre-install b/testing/stunnel/stunnel.pre-install
index cfb58054b23b8a97e8311509ea5f86ef97a32d49..22e6f41594266ef9341d0f112a81172c3d710aba 100644
--- a/testing/stunnel/stunnel.pre-install
+++ b/testing/stunnel/stunnel.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S stunnel 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G stunnel -g stunnel stunnel 2>/dev/null
+
 exit 0
diff --git a/testing/thttpd/thttpd.pre-install b/testing/thttpd/thttpd.pre-install
index c2ccfb705cf2493feeae24d7710abf603828aa0a..12e860797eefa37693c0a1665f5447faa2680711 100644
--- a/testing/thttpd/thttpd.pre-install
+++ b/testing/thttpd/thttpd.pre-install
@@ -4,3 +4,5 @@ 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
 addgroup thttpd www-data 2>/dev/null
+
+exit 0
diff --git a/testing/tor/tor.pre-install b/testing/tor/tor.pre-install
index 23536357917939ea5a678ba3e769e9e4f51a052b..5796d114f9c79124fc2f9ec5269014c5cc4d2070 100644
--- a/testing/tor/tor.pre-install
+++ b/testing/tor/tor.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 adduser -S -h /var/run/tor -s /sbin/nologin -D -g tor tor 2>/dev/null
-exit 0
 
+exit 0
diff --git a/testing/tvheadend-git/tvheadend-git.pre-install b/testing/tvheadend-git/tvheadend-git.pre-install
index 84ca2f8148d514c61cded4f412022d2047e0148a..3999c33bb89f587e281a853b929b0f17be535b06 100644
--- a/testing/tvheadend-git/tvheadend-git.pre-install
+++ b/testing/tvheadend-git/tvheadend-git.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
+
 adduser -S -s /sbin/nologin -H -h /usr/share/tvheadend -g tvheadend tvheadend 2>/dev/null
 adduser tvheadend video
+
 exit 0
diff --git a/testing/udevil/udevil.pre-install b/testing/udevil/udevil.pre-install
index bd4b7de4ec4a6f76df2768368193a81b99f603cd..9d4b1c3767e8a40e07be5542b52054f463ddf066 100644
--- a/testing/udevil/udevil.pre-install
+++ b/testing/udevil/udevil.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 addgroup -S plugdev 2>/dev/null
-exit 0
 
+exit 0
diff --git a/testing/vault/vault.pre-install b/testing/vault/vault.pre-install
index 60d449fd85ad3f730c0dc1199ebde043a921b08e..3df21bb3d2e9bc5fca27ad15440183c33c078955 100644
--- a/testing/vault/vault.pre-install
+++ b/testing/vault/vault.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S vault 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -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 9445d10853e15776a76cf384b6525588121cf9fa..e253007d2b82f499f79ce9697c0cd1839708347a 100644
--- a/testing/vnstat/vnstat.pre-install
+++ b/testing/vnstat/vnstat.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S vnstat 2>/dev/null
 adduser -S -h /var/lib/ -H -s /bin/false -D -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 849322d8b8fff81b5c4b22a38907a9ae6d38120a..07311bd8fda4e46d372b9ac3d20e912912a6e2af 100644
--- a/testing/wt/wt.pre-install
+++ b/testing/wt/wt.pre-install
@@ -1,5 +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
 addgroup wt www-data 2>/dev/null
+
 exit 0
diff --git a/testing/x2goserver/x2goserver.pre-install b/testing/x2goserver/x2goserver.pre-install
index 911390e092a074223c182be3da8f1b9c0b30a276..6a20a96a5c4d955626b51803c191391382df4eef 100755
--- a/testing/x2goserver/x2goserver.pre-install
+++ b/testing/x2goserver/x2goserver.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
 
-addgroup -S x2gouser
-adduser -S -D -G x2gouser -h /var/lib/x2go -s /bin/false -g x2gouser x2gouser
+addgroup -S x2gouser 2>/dev/null
+adduser -S -D -G x2gouser -h /var/lib/x2go -s /bin/false -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 3ec8ae7c4fc7a347a3ec2b949e3bc49ebe7995d8..2464f275cac1606952ed929c3d9b20b79e9b7b74 100644
--- a/testing/zabbix/zabbix-agent.pre-install
+++ b/testing/zabbix/zabbix-agent.pre-install
@@ -3,4 +3,5 @@
 addgroup -S zabbix 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -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 30851f153c81bd54e12110eeb3b3388fb69cbd5f..7cc5be2f89680bbe7d221cf17cbfa282e4a27abd 100644
--- a/testing/zabbix/zabbix.pre-install
+++ b/testing/zabbix/zabbix.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S 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/unmaintained/apache-couchdb/apache-couchdb.post-install b/unmaintained/apache-couchdb/apache-couchdb.post-install
index 4bf99a46bbdd44af663902cb171c3ac10c1bbd2a..ae1da50210ad7105867607cd2838e544cb36c0bb 100755
--- a/unmaintained/apache-couchdb/apache-couchdb.post-install
+++ b/unmaintained/apache-couchdb/apache-couchdb.post-install
@@ -1,4 +1,6 @@
 #!/bin/sh
-addgroup -S couchdb &>/dev/null
-adduser -S -h /var/run/couchdb -s /bin/false -G couchdb -D -g couchdb couchdb &>/dev/null
+
+addgroup -S couchdb 2>/dev/null
+adduser -S -h /var/run/couchdb -s /bin/false -G couchdb -D -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 d4cab3c0a6a5295176b571cd9b97153b9670029f..efda04bed68ef063c474125dfd670548e69e44ba 100644
--- a/unmaintained/ejabberd-git/ejabberd-git.pre-install
+++ b/unmaintained/ejabberd-git/ejabberd-git.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
-adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -g ejabberd ejabberd  2>/dev/null
+
+adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -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 ef2e67148ec5dcf002cd88a82e82926423d089a8..b55298b1ea4fa65fdbee317d72d91bd89fd5c8ce 100644
--- a/unmaintained/kde-workspace/kde-workspace.pre-install
+++ b/unmaintained/kde-workspace/kde-workspace.pre-install
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 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
+
 exit 0
diff --git a/unmaintained/shadowircd/shadowircd.pre-install b/unmaintained/shadowircd/shadowircd.pre-install
index e05b5e5f0e6eabf6cf57208e58c20f74b68cda1a..58b2a85c807a13539d115525b77220f2fb8b7beb 100644
--- a/unmaintained/shadowircd/shadowircd.pre-install
+++ b/unmaintained/shadowircd/shadowircd.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -h /var/run/shadowircd -s /bin/false -D -g ircd ircd 2>/dev/null
+
 exit 0