diff --git a/win32ss/gdi/ntgdi/init.c b/win32ss/gdi/ntgdi/init.c
index 44afa1219dfc4..35bab0f602987 100644
--- a/win32ss/gdi/ntgdi/init.c
+++ b/win32ss/gdi/ntgdi/init.c
@@ -7,9 +7,10 @@
  */
 
 #include <win32k.h>
-DBG_DEFAULT_CHANNEL(UserMisc);
 
-USHORT gusLanguageID;
+#define NDEBUG
+#include <debug.h>
+#include <kdros.h>
 
 BOOL NTAPI GDI_CleanupForProcess(struct _EPROCESS *Process);
 
@@ -76,29 +77,6 @@ GdiThreadDestroy(PETHREAD Thread)
 }
 
 
-BOOL
-InitializeGreCSRSS(VOID)
-{
-    /* Initialize DirectX graphics driver */
-    if (DxDdStartupDxGraphics(0, NULL, 0, NULL, NULL, gpepCSRSS) != STATUS_SUCCESS)
-    {
-        ERR("Unable to initialize DirectX graphics\n");
-        return FALSE;
-    }
-
-    /* Get global language ID */
-    gusLanguageID = UserGetLanguageID();
-
-    /* Initialize FreeType library */
-    if (!InitFontSupport())
-    {
-        ERR("Unable to initialize font support\n");
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
 /*
  * @implemented
  */
diff --git a/win32ss/gdi/ntgdi/misc.h b/win32ss/gdi/ntgdi/misc.h
index 06fa17b82550f..6757acce4c015 100644
--- a/win32ss/gdi/ntgdi/misc.h
+++ b/win32ss/gdi/ntgdi/misc.h
@@ -23,9 +23,7 @@ extern BOOL APIENTRY IntEngLeave(PINTENG_ENTER_LEAVE EnterLeave);
 extern HGDIOBJ StockObjects[];
 extern USHORT gusLanguageID;
 
-BOOL InitializeGreCSRSS(VOID);
 USHORT FASTCALL UserGetLanguageID(VOID);
-
 PVOID APIENTRY HackSecureVirtualMemory(IN PVOID,IN SIZE_T,IN ULONG,OUT PVOID *);
 VOID APIENTRY HackUnsecureVirtualMemory(IN PVOID);
 
diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c
index 235e8aee696ab..bdb36d452366f 100644
--- a/win32ss/user/ntuser/main.c
+++ b/win32ss/user/ntuser/main.c
@@ -26,6 +26,7 @@ NTSTATUS GdiThreadDestroy(PETHREAD Thread);
 
 PSERVERINFO gpsi = NULL; // Global User Server Information.
 
+USHORT gusLanguageID;
 PPROCESSINFO ppiScrnSaver;
 PPROCESSINFO gppiList = NULL;
 
@@ -1050,6 +1051,15 @@ DriverEntry(
     NT_ROF(InitTimerImpl());
     NT_ROF(InitDCEImpl());
 
+    gusLanguageID = UserGetLanguageID();
+
+    /* Initialize FreeType library */
+    if (!InitFontSupport())
+    {
+        DPRINT1("Unable to initialize font support\n");
+        return Status;
+    }
+
     return STATUS_SUCCESS;
 }
 
diff --git a/win32ss/user/ntuser/ntuser.c b/win32ss/user/ntuser/ntuser.c
index 6643495606dd1..fd2f5f97e93af 100644
--- a/win32ss/user/ntuser/ntuser.c
+++ b/win32ss/user/ntuser/ntuser.c
@@ -198,9 +198,12 @@ NtUserInitialize(
 // Initialize Power Request List (use hPowerRequestEvent).
 // Initialize Media Change (use hMediaRequestEvent).
 
-    /* Initialize various GDI stuff (DirectX, fonts, language ID etc.) */
-    if (!InitializeGreCSRSS())
-        return STATUS_UNSUCCESSFUL;
+// InitializeGreCSRSS();
+// {
+//    Startup DxGraphics.
+//    calls ** UserGetLanguageID() and sets it **.
+//    Enables Fonts drivers, Initialize Font table & Stock Fonts.
+// }
 
     /* Initialize USER */
     Status = UserInitialize();