diff --git a/instfiles/xrdp-sesman.service b/instfiles/xrdp-sesman.service
index d40150cd..69882783 100644
--- a/instfiles/xrdp-sesman.service
+++ b/instfiles/xrdp-sesman.service
@@ -2,6 +2,7 @@
 Description=xrdp session manager
 After=syslog.target network.target
 StopWhenUnneeded=true
+BindTo=xrdp.service
 
 [Service]
 Type=forking
diff --git a/instfiles/xrdp.service b/instfiles/xrdp.service
index 7bb076d1..843500d6 100644
--- a/instfiles/xrdp.service
+++ b/instfiles/xrdp.service
@@ -7,7 +7,7 @@ After=syslog.target network.target xrdp-sesman.service
 Type=forking
 PIDFile=/var/run/xrdp.pid
 EnvironmentFile=/etc/sysconfig/xrdp
-ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS
+ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS --nodaemon
 ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill
 
 [Install]