diff --git a/Cargo.toml b/Cargo.toml
index b2e590a5..ced7d0f9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -90,5 +90,6 @@ section = "sound"
 priority = "optional"
 assets = [
     ["target/release/librespot", "usr/bin/", "755"],
-    ["contrib/librespot.service", "lib/systemd/system/", "644"]
+    ["contrib/librespot.service", "lib/systemd/system/", "644"],
+    ["contrib/librespot.user.service", "lib/systemd/user/", "644"]
 ]
diff --git a/README.md b/README.md
index 33b2b76e..bcf73cac 100644
--- a/README.md
+++ b/README.md
@@ -89,6 +89,7 @@ The above command will create a receiver named ```Librespot```, with bitrate set
 A full list of runtime options are available [here](https://github.com/librespot-org/librespot/wiki/Options)
 
 _Please Note: When using the cache feature, an authentication blob is stored for your account in the cache directory. For security purposes, we recommend that you set directory permissions on the cache directory to `700`._
+
 ## Contact
 Come and hang out on gitter if you need help or want to offer some.
 https://gitter.im/librespot-org/spotify-connect-resources
diff --git a/contrib/librespot.service b/contrib/librespot.service
index bd381df2..76037c8c 100644
--- a/contrib/librespot.service
+++ b/contrib/librespot.service
@@ -1,5 +1,7 @@
 [Unit]
-Description=Librespot
+Description=Librespot (an open source Spotify client)
+Documentation=https://github.com/librespot-org/librespot
+Documentation=https://github.com/librespot-org/librespot/wiki/Options
 Requires=network-online.target
 After=network-online.target
 
@@ -8,8 +10,7 @@ User=nobody
 Group=audio
 Restart=always
 RestartSec=10
-ExecStart=/usr/bin/librespot -n "%p on %H"
+ExecStart=/usr/bin/librespot --name "%p@%H"
 
 [Install]
 WantedBy=multi-user.target
-
diff --git a/contrib/librespot.user.service b/contrib/librespot.user.service
new file mode 100644
index 00000000..a676dde0
--- /dev/null
+++ b/contrib/librespot.user.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Librespot (an open source Spotify client)
+Documentation=https://github.com/librespot-org/librespot
+Documentation=https://github.com/librespot-org/librespot/wiki/Options
+
+[Service]
+Restart=always
+RestartSec=10
+ExecStart=/usr/bin/librespot --name "%u@%H"
+
+[Install]
+WantedBy=default.target