diff --git a/data/signal.service b/data/signal-cli.service
similarity index 77%
rename from data/signal.service
rename to data/signal-cli.service
index 089b0428..1e4a5a5c 100644
--- a/data/signal.service
+++ b/data/signal-cli.service
@@ -8,7 +8,7 @@ After=network-online.target
 [Service]
 Type=dbus
 Environment="SIGNAL_CLI_OPTS=-Xms2m"
-ExecStart=%dir%/bin/signal-cli -u %number% --config /var/lib/signal-cli daemon --system
+ExecStart=%dir%/bin/signal-cli --config /var/lib/signal-cli daemon --system
 User=signal-cli
 BusName=org.asamk.Signal
 
diff --git a/data/signal-cli@.service b/data/signal-cli@.service
index 4cc6e2cf..61addf3b 100644
--- a/data/signal-cli@.service
+++ b/data/signal-cli@.service
@@ -13,4 +13,4 @@ User=signal-cli
 BusName=org.asamk.Signal
 
 [Install]
-WantedBy=multi-user.target
+Alias=dbus-org.asamk.Signal.service