diff --git a/reactos/subsystems/win32/win32k/ntuser/keyboard.c b/reactos/subsystems/win32/win32k/ntuser/keyboard.c
index 57c21740a6b..6694acb0a10 100644
--- a/reactos/subsystems/win32/win32k/ntuser/keyboard.c
+++ b/reactos/subsystems/win32/win32k/ntuser/keyboard.c
@@ -1284,7 +1284,8 @@ UserGetKeyboardLayout(
          SetLastWin32Error(ERROR_INVALID_PARAMETER);
          return 0;
       }
-      W32Thread = Thread->Tcb.Win32Thread;
+      W32Thread = Thread->Tcb.Win32Thread; /* Wrong, but returning the pointer to
+                                              the table. */
    }
    layout = W32Thread->KeyboardLayout;
    if(!layout)
@@ -1330,22 +1331,20 @@ UserGetKeyboardType(
    }
 }
 
+
 DWORD
 STDCALL
-NtUserGetKeyboardType(
-   DWORD TypeFlag)
+NtUserLoadKeyboardLayoutEx(
+   DWORD Unknown0,
+   DWORD Unknown1,
+   DWORD Unknown2,
+   DWORD Unknown3,
+   DWORD Unknown4,
+   DWORD Unknown5)
 {
-   DECLARE_RETURN(DWORD);
-   
-   DPRINT("Enter NtUserGetKeyboardType\n");
-   UserEnterShared();
-   
-   RETURN( UserGetKeyboardType(TypeFlag));
-   
-CLEANUP:
-   DPRINT("Leave NtUserGetKeyboardType, ret=%i\n",_ret_);
-   UserLeave();
-   END_CLEANUP;
+   UNIMPLEMENTED
+
+   return 0;
 }
 
 
diff --git a/reactos/subsystems/win32/win32k/ntuser/ntstubs.c b/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
index c4a6ee56f12..56495fc0ae6 100644
--- a/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
+++ b/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
@@ -441,21 +441,6 @@ NtUserInitTask(
    return 0;
 }
 
-DWORD
-STDCALL
-NtUserLoadKeyboardLayoutEx(
-   DWORD Unknown0,
-   DWORD Unknown1,
-   DWORD Unknown2,
-   DWORD Unknown3,
-   DWORD Unknown4,
-   DWORD Unknown5)
-{
-   UNIMPLEMENTED
-
-   return 0;
-}
-
 DWORD
 STDCALL
 NtUserLockWorkStation(VOID)