diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf
index b5c7926de3c..4e4e81653d6 100644
--- a/boot/bootdata/hivesft.inf
+++ b/boot/bootdata/hivesft.inf
@@ -1373,7 +1373,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","ConsoleShell",0x00
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32\userinit.exe"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","AutoAdminLogon",0x00000000,"1"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultDomain",0x00000000,""
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultDomainName",0x00000000,""
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultUserName",0x00000000,""
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultPassword",0x00000000,""
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify",,0x00000012
diff --git a/dll/win32/msgina/msgina.c b/dll/win32/msgina/msgina.c
index 6cb3bc53242..90e59250d29 100644
--- a/dll/win32/msgina/msgina.c
+++ b/dll/win32/msgina/msgina.c
@@ -246,7 +246,7 @@ GetRegistrySettings(PGINA_CONTEXT pgContext)
 
     dwSize = sizeof(pgContext->Domain);
     rc = RegQueryValueExW(hKey,
-                          L"DefaultDomain",
+                          L"DefaultDomainName",
                           NULL,
                           NULL,
                           (LPBYTE)&pgContext->Domain,
diff --git a/dll/win32/syssetup/security.c b/dll/win32/syssetup/security.c
index cc35f9a8a3f..221d0152af8 100644
--- a/dll/win32/syssetup/security.c
+++ b/dll/win32/syssetup/security.c
@@ -580,7 +580,7 @@ SetAutoAdminLogon(VOID)
     if (wcscmp(szAutoAdminLogon, L"1") == 0)
     {
         RegSetValueExW(hKey,
-                       L"DefaultDomain",
+                       L"DefaultDomainName",
                        0,
                        REG_SZ,
                        (LPBYTE)AdminInfo.Domain,
diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c
index 9c57f6b2da1..b896adf193c 100644
--- a/dll/win32/syssetup/wizard.c
+++ b/dll/win32/syssetup/wizard.c
@@ -594,14 +594,14 @@ WriteDefaultLogonData(LPWSTR Domain)
         return FALSE;
 
     lError = RegSetValueEx(hKey,
-                           L"DefaultDomain",
+                           L"DefaultDomainName",
                            0,
                            REG_SZ,
                            (LPBYTE)Domain,
                            (wcslen(Domain)+ 1) * sizeof(WCHAR));
     if (lError != ERROR_SUCCESS)
     {
-        DPRINT1("RegSetValueEx(\"DefaultDomain\") failed!\n");
+        DPRINT1("RegSetValueEx(\"DefaultDomainName\") failed!\n");
     }
 
     lError = RegSetValueEx(hKey,