diff --git a/reactos/base/system/services/rpcserver.c b/reactos/base/system/services/rpcserver.c
index 44ef7e22792..b42f81aca64 100644
--- a/reactos/base/system/services/rpcserver.c
+++ b/reactos/base/system/services/rpcserver.c
@@ -1969,8 +1969,9 @@ DWORD RCreateServiceW(
             goto done;
     }
 
-    /* If a non driver and NULL for lpServiceName, write ObjectName as LocalSystem */
-    if ((dwServiceType & SERVICE_WIN32) && (!lpServiceName))
+    /* FIXME: Handle lpServiceStartName propertly! */
+    /* If a non driver and NULL for lpServiceStartName, write ObjectName as LocalSystem */
+    if ((dwServiceType & SERVICE_WIN32) && (!lpServiceStartName))
     {
         dwError = RegSetValueExW(hServiceKey,
                                  L"ObjectName",