diff --git a/contrib/myMPD.spec b/contrib/myMPD.spec
index 2156c53..d5324d3 100644
--- a/contrib/myMPD.spec
+++ b/contrib/myMPD.spec
@@ -39,9 +39,9 @@ make install DESTDIR=%{buildroot}
 
 %post
 getent group mympd > /dev/null
-[ "$?" = "2" ] && groupadd mympd
+[ "$?" = "2" ] && groupadd -r mympd
 getent passwd mympd > /dev/null
-[ "$?" = "2" ] && useradd mympd -g mympd -d /var/lib/mympd -s /usr/sbin/nologin
+[ "$?" = "2" ] && useradd -r mympd -g mympd -d /var/lib/mympd -s /usr/sbin/nologin
 if [ -d /usr/lib/systemd/ ]
 then
   [ -d /usr/lib/systemd/system ] || sudo mkdir /usr/lib/systemd/system 
diff --git a/debian/postinst b/debian/postinst
index 786464b..f72775f 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -2,9 +2,9 @@
 
 echo "Fixing ownership of /var/lib/mympd"
 getent group mympd > /dev/null
-[ "$?" = "2" ] && groupadd mympd
+[ "$?" = "2" ] && groupadd -r mympd
 getent passwd mympd > /dev/null
-[ "$?" = "2" ] && useradd mympd -g mympd-d /var/lib/mympd -s /usr/sbin/nologin
+[ "$?" = "2" ] && useradd -r mympd -g mympd-d /var/lib/mympd -s /usr/sbin/nologin
 
 chown -R mympd.mympd /var/lib/mympd
 
diff --git a/mkrelease.sh b/mkrelease.sh
index 0270f73..f7ee686 100755
--- a/mkrelease.sh
+++ b/mkrelease.sh
@@ -51,9 +51,9 @@ cd ..
 
 echo "Fixing ownership of /var/lib/mympd"
 getent group mympd > /dev/null
-[ "$?" = "2" ] && sudo groupadd mympd
+[ "$?" = "2" ] && sudo groupadd -r mympd
 getent passwd mympd > /dev/null
-[ "$?" = "2" ] && sudo useradd mympd -g mympd -d /var/lib/mympd -s /usr/sbin/nologin
+[ "$?" = "2" ] && sudo useradd -r mympd -g mympd -d /var/lib/mympd -s /usr/sbin/nologin
 sudo chown -R mympd.mympd /var/lib/mympd
 
 echo "Trying to link musicdir to library"