diff --git a/dbus/org.nemo.ssu.conf b/dbus/org.nemo.ssu.conf
index 1941286..ab31c6a 100644
--- a/dbus/org.nemo.ssu.conf
+++ b/dbus/org.nemo.ssu.conf
@@ -8,7 +8,7 @@
     <allow send_destination="org.nemo.ssu" send_interface="org.nemo.ssu"/>
   </policy>
 
-  <policy group="system">
+  <policy group="sailfish-system">
     <allow send_destination="org.nemo.ssu" send_interface="org.nemo.ssu"/>
     <allow send_destination="org.nemo.ssu" send_interface="org.freedesktop.DBus.Introspectable"/>
     <allow send_destination="org.nemo.ssu" send_interface="org.freedesktop.DBus.Peer"/>
diff --git a/rpm/ssu.spec b/rpm/ssu.spec
index a23f981..6a7d619 100644
--- a/rpm/ssu.spec
+++ b/rpm/ssu.spec
@@ -17,6 +17,7 @@ BuildRequires: pkgconfig(libshadowutils)
 BuildRequires: pkgconfig(connman-qt5)
 BuildRequires: oneshot
 BuildRequires: doxygen
+Requires(pre): sailfish-setup
 Requires(pre): shadow-utils
 Requires(pre): /usr/bin/groupadd-user
 Requires(postun): shadow-utils
@@ -189,8 +190,6 @@ cd .. && cp -R doc/html/* %{buildroot}/%{_docdir}/%{name}/
 
 
 %pre
-groupadd -rf ssu
-groupadd-user ssu
 if [ -f /etc/ssu/ssu.ini ]; then
   chgrp ssu /etc/ssu/ssu.ini
   chmod 664 /etc/ssu/ssu.ini