From 750940e2f5437be5fc246430ee6563efe8719c25 Mon Sep 17 00:00:00 2001
From: Ilia Ross <ilia@ross.gdn>
Date: Thu, 4 Jun 2026 12:11:35 +0200
Subject: [PATCH] Fix to respect Unix user identity for systemd user unit
 defaults

---
 init/edit_systemd.cgi | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/init/edit_systemd.cgi b/init/edit_systemd.cgi
index 21fd7c9b3..2a379825f 100755
--- a/init/edit_systemd.cgi
+++ b/init/edit_systemd.cgi
@@ -86,8 +86,12 @@ if ($in{'new'}) {
 			    &ui_yesno_radio("boot", 1));
 
 	# User service controls
-	my $default_unituser = $unituser ||
-		($remote_user && $remote_user ne "root" ? $remote_user : undef);
+	my $default_unituser = $unituser;
+	if (!$default_unituser) {
+		my $ruinfo = &get_systemd_user_details($remote_user);
+		$default_unituser = $ruinfo->{'user'}
+			if ($ruinfo && $ruinfo->{'uid'} != 0);
+		}
 	# User units live in the selected user's home and run under that user's
 	# systemd manager, so the service-level User=/Group= rows are hidden by JS.
 	print &ui_table_row(&hlink($text{'systemd_userservice'}, "systemd_userservice"),