diff --git a/data/org.asamk.Signal_NUMBER.conf b/data/org.asamk.Signal_NUMBER.conf
new file mode 100644
index 00000000..8163b13d
--- /dev/null
+++ b/data/org.asamk.Signal_NUMBER.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0"?> <!--*-nxml-*-->
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+        "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+
+<busconfig>
+        <policy user="signal-cli">
+                <allow own="org.asamk.Signal_%number%"/>
+                <allow send_destination="org.asamk.Signal_%number%"/>
+                <allow receive_sender="org.asamk.Signal_%number%"/>
+        </policy>
+
+        <policy context="default">
+                <allow send_destination="org.asamk.Signal_%number%"/>
+                <allow receive_sender="org.asamk.Signal_%number%"/>
+        </policy>
+</busconfig>
diff --git a/data/signal-cli@.service b/data/signal-cli@.service
index 4cc6e2cf..cc9bf688 100644
--- a/data/signal-cli@.service
+++ b/data/signal-cli@.service
@@ -8,9 +8,9 @@ After=network-online.target
 [Service]
 Type=dbus
 Environment="SIGNAL_CLI_OPTS=-Xms2m"
-ExecStart=%dir%/bin/signal-cli -u %I --config /var/lib/signal-cli daemon --system
+ExecStart=%dir%/bin/signal-cli -u +%I --busname org.asamk.Signal_%I --config /var/lib/signal-cli daemon --system
 User=signal-cli
-BusName=org.asamk.Signal
+BusName=org.asamk.Signal_%I
 
 [Install]
 WantedBy=multi-user.target