diff --git a/dll/win32/user32/misc/usrapihk.c b/dll/win32/user32/misc/usrapihk.c
index 4dabbbe9942..3eadd8a301b 100644
--- a/dll/win32/user32/misc/usrapihk.c
+++ b/dll/win32/user32/misc/usrapihk.c
@@ -259,7 +259,7 @@ InitUserApiHook(HINSTANCE hInstance, USERAPIHOOKPROC pfn)
 
   RtlEnterCriticalSection(&gcsUserApiHook);
 
-  if (!pfn(uahLoadInit,(ULONG_PTR)&uah) ||  // Swap data, User32 to and Uxtheme from!
+  if (!pfn(uahLoadInit,&uah) ||  // Swap data, User32 to and Uxtheme from!
        uah.ForceResetUserApiHook != (FARPROC)ForceResetUserApiHook ||
        uah.size <= 0 )
   {
@@ -391,7 +391,5 @@ BOOL WINAPI RegisterUserApiHook(PUSERAPIHOOKINFO puah)
  */
 BOOL WINAPI UnregisterUserApiHook(VOID)
 {
-  // Direct call to Win32k! Here only as a prototype.....
-  UNIMPLEMENTED;
-  return FALSE;
+    return NtUserUnregisterUserApiHook();
 }