diff --git a/reactos/win32ss/user/winsrv/usersrv/register.c b/reactos/win32ss/user/winsrv/usersrv/register.c
index e1a7154f712..0070a3407d7 100644
--- a/reactos/win32ss/user/winsrv/usersrv/register.c
+++ b/reactos/win32ss/user/winsrv/usersrv/register.c
@@ -17,8 +17,7 @@
 /* GLOBALS ********************************************************************/
 
 static BOOLEAN ServicesProcessIdValid = FALSE;
-static ULONG_PTR ServicesProcessId = 0;
-
+ULONG_PTR ServicesProcessId = 0;
 ULONG_PTR LogonProcessId = 0;
 
 /* PUBLIC SERVER APIS *********************************************************/
@@ -36,7 +35,7 @@ CSR_API(SrvRegisterLogonProcess)
     }
     else
     {
-        if (ApiMessage->Header.ClientId.UniqueProcess != (HANDLE)LogonProcessId)
+        if (ApiMessage->Header.ClientId.UniqueProcess != UlongToHandle(LogonProcessId))
         {
             DPRINT1("Current logon process 0x%x, can't deregister from process 0x%x\n",
                     LogonProcessId, ApiMessage->Header.ClientId.UniqueProcess);
diff --git a/reactos/win32ss/user/winsrv/usersrv/usersrv.h b/reactos/win32ss/user/winsrv/usersrv/usersrv.h
index 511acd40ac7..101a0e571dc 100644
--- a/reactos/win32ss/user/winsrv/usersrv/usersrv.h
+++ b/reactos/win32ss/user/winsrv/usersrv/usersrv.h
@@ -38,6 +38,7 @@
 /* Globals */
 extern HINSTANCE UserServerDllInstance;
 extern HANDLE UserServerHeap;
+extern ULONG_PTR ServicesProcessId;
 extern ULONG_PTR LogonProcessId;
 
 #endif /* __USERSRV_H__ */