diff --git a/model/daemon-installer.linux.go b/model/daemon-installer.linux.go
index 2a319f1..603b437 100644
--- a/model/daemon-installer.linux.go
+++ b/model/daemon-installer.linux.go
@@ -166,7 +166,8 @@ func (l *LinuxDaemonInstaller) GetDaemonServiceFile(username string) (buf bytes.
 		return
 	}
 	err = tmpl.Execute(&buf, map[string]string{
-		"UserName": username,
+		"UserName":   username,
+		"BaseFolder": l.baseFolder,
 	})
 	return
 }
diff --git a/model/sys-desc/shelltime.service b/model/sys-desc/shelltime.service
index 5b6752d..3a95f77 100644
--- a/model/sys-desc/shelltime.service
+++ b/model/sys-desc/shelltime.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=simple
-ExecStart=/bin/sh -c 'exec $(getent passwd $USER | cut -d: -f7) -l -c "{{.BaseFolder}}/bin/shelltime-daemon"'
+ExecStart=/bin/sh -c 'exec $(getent passwd $(id -un) | cut -d: -f7) -l -c "{{.BaseFolder}}/bin/shelltime-daemon"'
 Restart=always
 
 # Resource limits