diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c
index 7419b4e446f..23d67960dc8 100644
--- a/win32ss/user/ntuser/desktop.c
+++ b/win32ss/user/ntuser/desktop.c
@@ -143,7 +143,13 @@ IntDesktopObjectParse(IN PVOID ParseObject,
                             0,
                             0,
                             (PVOID*)&Desktop);
-    if (!NT_SUCCESS(Status)) return Status;
+    if (!NT_SUCCESS(Status))
+        return Status;
+    RtlZeroMemory(Desktop, sizeof(DESKTOP));
+
+    /* Assign the session ID to the desktop */
+    Desktop->dwSessionId = PsGetCurrentProcessSessionId(); // gSessionId
+    ASSERT(Desktop->dwSessionId == WinStaObject->dwSessionId);
 
     /* Assign security to the desktop we have created */
     Status = IntAssignDesktopSecurityOnParse(WinStaObject, Desktop, AccessState);
@@ -2278,8 +2284,6 @@ UserInitializeDesktop(PDESKTOP pdesk, PUNICODE_STRING DesktopName, PWINSTATION_O
 
     TRACE("UserInitializeDesktop desktop 0x%p with name %wZ\n", pdesk, DesktopName);
 
-    RtlZeroMemory(pdesk, sizeof(DESKTOP));
-
     /* Set desktop size, based on whether the WinSta is interactive or not */
     if (pwinsta == InputWindowStation)
     {
@@ -2488,8 +2492,7 @@ IntCreateDesktop(
     }
     pWnd->fnid = FNID_DESKTOP;
 
-    /* Assign the session ID and the desktop window to the desktop */
-    pdesk->dwSessionId = PsGetCurrentProcessSessionId();
+    /* Assign the desktop window to the desktop */
     pdesk->DesktopWindow = UserHMGetHandle(pWnd);
     pdesk->pDeskInfo->spwnd = pWnd;
 
@@ -2982,7 +2985,7 @@ NtUserSwitchDesktop(HDESK hdesk)
         goto Exit; // Return FALSE
     }
 
-    if (PsGetCurrentProcessSessionId() != pdesk->rpwinstaParent->dwSessionId)
+    if (PsGetCurrentProcessSessionId() != pdesk->dwSessionId)
     {
         ObDereferenceObject(pdesk);
         ERR("NtUserSwitchDesktop called for a desktop of a different session\n");
diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c
index f35535c8024..747ed0ca2d3 100644
--- a/win32ss/user/ntuser/menu.c
+++ b/win32ss/user/ntuser/menu.c
@@ -321,7 +321,7 @@ IntDestroyMenuObject(PMENU Menu, BOOL bRecurse)
    {
       PWND Window;
 
-      if (PsGetCurrentProcessSessionId() == Menu->head.rpdesk->rpwinstaParent->dwSessionId)
+      if (PsGetCurrentProcessSessionId() == Menu->head.rpdesk->dwSessionId)
       {
          BOOL ret;
          if (Menu->hWnd)
diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c
index 1c32f99c683..116618aafcc 100644
--- a/win32ss/user/ntuser/winsta.c
+++ b/win32ss/user/ntuser/winsta.c
@@ -504,12 +504,13 @@ IntCreateWindowStation(
         SetLastNtError(Status);
         return Status;
     }
-
-    /* Initialize the window station */
     RtlZeroMemory(WindowStation, sizeof(WINSTATION_OBJECT));
 
+    /* Assign the session ID to the window station */
+    WindowStation->dwSessionId = PsGetCurrentProcessSessionId(); // gSessionId
+
+    /* Initialize the window station */
     InitializeListHead(&WindowStation->DesktopListHead);
-    WindowStation->dwSessionId = NtCurrentPeb()->SessionId;
     Status = RtlCreateAtomTable(37, &WindowStation->AtomTable);
     if (!NT_SUCCESS(Status))
     {