diff --git a/systemd/safe-harbor@.service b/systemd/safe-harbor@.service
index daa55b0..2eb52be 100644
--- a/systemd/safe-harbor@.service
+++ b/systemd/safe-harbor@.service
@@ -3,7 +3,10 @@ Description=Safe Harbor SSH tunnel
 After=network.target
 
 [Service]
-User=$i
+User=%i
 ExecStart=/usr/bin/python3 /usr/lib/safe-harbor/safe-harbor.py
 Restart=always
 RestartSec=90
+
+[Install]
+WantedBy=multi-user.target