diff --git a/open-vm-tools/vmware-user-suid-wrapper/systemd/user/app-vmware-user.service b/open-vm-tools/vmware-user-suid-wrapper/systemd/user/app-vmware-user.service
new file mode 100644
index 000000000..56acb2ecf
--- /dev/null
+++ b/open-vm-tools/vmware-user-suid-wrapper/systemd/user/app-vmware-user.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Open Virtual Machine Tools (vmware-user)
+Documentation=https://github.com/vmware/open-vm-tools
+ConditionVirtualization=vmware
+PartOf=graphical-session.target
+After=graphical-session.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/vmware-user-suid-wrapper
+Slice=app.slice
+
+[Install]
+WantedBy=graphical-session.target
diff --git a/open-vm-tools/vmware-user-suid-wrapper/vmware-user.desktop.in b/open-vm-tools/vmware-user-suid-wrapper/vmware-user.desktop.in
index 50149be7e..279a3c800 100644
--- a/open-vm-tools/vmware-user-suid-wrapper/vmware-user.desktop.in
+++ b/open-vm-tools/vmware-user-suid-wrapper/vmware-user.desktop.in
@@ -6,4 +6,6 @@ Name=VMware User Agent
 # KDE bug 190522: KDE does not autostart items with NoDisplay=true...
 # NoDisplay=true
 X-KDE-autostart-phase=1
-
+# Prevent processing via systemd-xdg-autostart-generator: https://systemd.io/DESKTOP_ENVIRONMENTS/#xdg-autostart-integration
+# Correct service config provided by app-vmware-user.service
+X-systemd-skip=true