diff --git a/onedrive.service.in b/systemd.units/onedrive.service.in
similarity index 50%
rename from onedrive.service.in
rename to systemd.units/onedrive.service.in
index 1c014f39..8788b337 100644
--- a/onedrive.service.in
+++ b/systemd.units/onedrive.service.in
@@ -1,10 +1,13 @@
 [Unit]
 Description=OneDrive Free Client
 Documentation=https://github.com/skilion/onedrive
+Requires=network-online.target
+After=network-online.target
 
 [Service]
-ExecStart=@PREFIX@/bin/onedrive -m
-Restart=no
+ExecStart=@PREFIX@/bin/onedrive --monitor
+Restart=on-failure
+RestartSec=3
 
 [Install]
 WantedBy=default.target
diff --git a/systemd.units/onedrive@.service.in b/systemd.units/onedrive@.service.in
new file mode 100644
index 00000000..59d90bf3
--- /dev/null
+++ b/systemd.units/onedrive@.service.in
@@ -0,0 +1,15 @@
+[Unit]
+Description=OneDrive Free Client for %i
+Documentation=https://github.com/skilion/onedrive
+Requires=network-online.target
+After=network-online.target
+
+[Service]
+ExecStart=@PREFIX@/bin/onedrive --monitor --confdir=/home/%i/.config/onedrive
+User=%i
+Group=users
+Restart=on-failure
+RestartSec=3
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file