diff --git a/net-im/spectrum2/spectrum2-9999.ebuild b/net-im/spectrum2/spectrum2-9999.ebuild
index 2157170..c5f6001 100644
--- a/net-im/spectrum2/spectrum2-9999.ebuild
+++ b/net-im/spectrum2/spectrum2-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils python-any-r1 systemd user
+inherit cmake-utils python-any-r1 systemd
 
 if [[ ${PV} = "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/SpectrumIM/${PN}.git"
@@ -26,6 +26,8 @@ IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 RDEPEND="
+	acct-group/spectrum
+	acct-user/spectrum
 	dev-libs/boost:=[nls]
 	dev-libs/expat
 	dev-libs/libev:=
@@ -75,9 +77,6 @@ python_check_deps() {
 }
 
 pkg_setup() {
-	enewgroup spectrum
-	enewuser spectrum -1 -1 /var/lib/spectrum2 spectrum
-
 	use test && python-any-r1_pkg_setup
 }