diff --git a/dll/cpl/usrmgr/lang/cs-CZ.rc b/dll/cpl/usrmgr/lang/cs-CZ.rc
index e1739aec375..fee1f9f6911 100644
--- a/dll/cpl/usrmgr/lang/cs-CZ.rc
+++ b/dll/cpl/usrmgr/lang/cs-CZ.rc
@@ -17,7 +17,7 @@ BEGIN
     PUSHBUTTON "&Přidat...", IDC_USERS_ADD, 87, 98, 50, 14
     PUSHBUTTON "&Odebrat", IDC_USERS_REMOVE, 141, 98, 50, 14
     PUSHBUTTON "&Vlastnosti", IDC_USERS_PROPERTIES, 195, 98, 50, 14
-    AUTOCHECKBOX "Vyžadovat uživatelské jméno a heslo při spuštění sytému.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
+    AUTOCHECKBOX "Vyžadovat uživatelské jméno a heslo při spuštění sytému.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14
     PUSHBUTTON "Reset Password", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED
 END
 
diff --git a/dll/cpl/usrmgr/lang/de-DE.rc b/dll/cpl/usrmgr/lang/de-DE.rc
index 25882b60e30..d2f1642b2a9 100644
--- a/dll/cpl/usrmgr/lang/de-DE.rc
+++ b/dll/cpl/usrmgr/lang/de-DE.rc
@@ -12,7 +12,7 @@ BEGIN
     PUSHBUTTON "&Hinzufügen...", IDC_USERS_ADD, 87, 98, 50, 14
     PUSHBUTTON "&Entfernen", IDC_USERS_REMOVE, 141, 98, 50, 14
     PUSHBUTTON "E&igenschaften", IDC_USERS_PROPERTIES, 195, 98, 50, 14
-    AUTOCHECKBOX "Benut&zer müssen Benutzername und Kennwort zum Starten eingeben", IDC_USERS_STARTUP_REQUIRE, 10, 118, 235, 14, WS_DISABLED
+    AUTOCHECKBOX "Benut&zer müssen Benutzername und Kennwort zum Starten eingeben", IDC_USERS_STARTUP_REQUIRE, 10, 118, 235, 14
     PUSHBUTTON "Kenn&wort zurücksetzen", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED
 END
 
diff --git a/dll/cpl/usrmgr/lang/en-US.rc b/dll/cpl/usrmgr/lang/en-US.rc
index 6aa8650efb6..6db4ab249f9 100644
--- a/dll/cpl/usrmgr/lang/en-US.rc
+++ b/dll/cpl/usrmgr/lang/en-US.rc
@@ -12,7 +12,7 @@ BEGIN
     PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14
     PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14
     PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14
-    AUTOCHECKBOX "Re&quire user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
+    AUTOCHECKBOX "Re&quire user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14
     PUSHBUTTON "R&eset Password", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED
 END
 
diff --git a/dll/cpl/usrmgr/lang/es-ES.rc b/dll/cpl/usrmgr/lang/es-ES.rc
index 5e9ef38e146..86f385675eb 100644
--- a/dll/cpl/usrmgr/lang/es-ES.rc
+++ b/dll/cpl/usrmgr/lang/es-ES.rc
@@ -14,7 +14,7 @@ BEGIN
     PUSHBUTTON "A&gregar..", IDC_USERS_ADD, 87, 98, 50, 14
     PUSHBUTTON "&Quitar", IDC_USERS_REMOVE, 141, 98, 50, 14
     PUSHBUTTON "Pr&opiedades", IDC_USERS_PROPERTIES, 195, 98, 50, 14
-    AUTOCHECKBOX "Forzar la entrada de usuario y contraseña al iniciar el sistema.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
+    AUTOCHECKBOX "Forzar la entrada de usuario y contraseña al iniciar el sistema.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14
     PUSHBUTTON "Reiniciar contraseña", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED
 END
 
diff --git a/dll/cpl/usrmgr/lang/fr-FR.rc b/dll/cpl/usrmgr/lang/fr-FR.rc
index 0b6f9f321c6..df4df363eae 100644
--- a/dll/cpl/usrmgr/lang/fr-FR.rc
+++ b/dll/cpl/usrmgr/lang/fr-FR.rc
@@ -12,7 +12,7 @@ BEGIN
     PUSHBUTTON "A&jouter...", IDC_USERS_ADD, 87, 98, 50, 14
     PUSHBUTTON "&Retirer", IDC_USERS_REMOVE, 141, 98, 50, 14
     PUSHBUTTON "Pr&opriétés", IDC_USERS_PROPERTIES, 195, 98, 50, 14
-    AUTOCHECKBOX "Nécessite un identifiant et mot de passe au démarrage du système.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 235, 14, WS_DISABLED
+    AUTOCHECKBOX "Nécessite un identifiant et mot de passe au démarrage du système.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 235, 14
     PUSHBUTTON "Réinitialiser le &mot de passe", IDC_USERS_RESET, 145, 200, 100, 14, WS_DISABLED
 END
 
diff --git a/dll/cpl/usrmgr/lang/he-IL.rc b/dll/cpl/usrmgr/lang/he-IL.rc
index 6906fbf02c9..2c1e4409ac1 100644
--- a/dll/cpl/usrmgr/lang/he-IL.rc
+++ b/dll/cpl/usrmgr/lang/he-IL.rc
@@ -12,7 +12,7 @@ BEGIN
     PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14
     PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14
     PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14
-    AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
+    AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14
     PUSHBUTTON "Reset Password", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED
 END
 
diff --git a/dll/cpl/usrmgr/lang/id-ID.rc b/dll/cpl/usrmgr/lang/id-ID.rc
index 2b3a517a252..b5e5db57cef 100644
--- a/dll/cpl/usrmgr/lang/id-ID.rc
+++ b/dll/cpl/usrmgr/lang/id-ID.rc
@@ -12,7 +12,7 @@ BEGIN
     PUSHBUTTON "&Tambah...", IDC_USERS_ADD, 87, 98, 50, 14
     PUSHBUTTON "&Hapus", IDC_USERS_REMOVE, 141, 98, 50, 14
     PUSHBUTTON "Pr&operti", IDC_USERS_PROPERTIES, 195, 98, 50, 14
-    AUTOCHECKBOX "&Butuh nama pengguna dan kata sandi saat memulai sistem.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
+    AUTOCHECKBOX "&Butuh nama pengguna dan kata sandi saat memulai sistem.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14
     PUSHBUTTON "R&eset Kata Sandi", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED
 END
 
diff --git a/dll/cpl/usrmgr/lang/it-IT.rc b/dll/cpl/usrmgr/lang/it-IT.rc
index 2735c130e80..d532c18729a 100644
--- a/dll/cpl/usrmgr/lang/it-IT.rc
+++ b/dll/cpl/usrmgr/lang/it-IT.rc
@@ -12,7 +12,7 @@ BEGIN
    PUSHBUTTON "N&uovo...", IDC_USERS_ADD, 87, 98, 50, 14
    PUSHBUTTON "&Rimuovi", IDC_USERS_REMOVE, 141, 98, 50, 14
    PUSHBUTTON "Pr&oprietà", IDC_USERS_PROPERTIES, 195, 98, 50, 14
-   AUTOCHECKBOX "Richiesta la password all'avvio del sistema.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
+   AUTOCHECKBOX "Richiesta la password all'avvio del sistema.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14
    PUSHBUTTON "Resetta Password", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED
 END
 
diff --git a/dll/cpl/usrmgr/lang/ja-JP.rc b/dll/cpl/usrmgr/lang/ja-JP.rc
index c462bc862fd..06fa5b05aea 100644
--- a/dll/cpl/usrmgr/lang/ja-JP.rc
+++ b/dll/cpl/usrmgr/lang/ja-JP.rc
@@ -12,7 +12,7 @@ BEGIN
     PUSHBUTTON "追加(&D)...", IDC_USERS_ADD, 87, 98, 50, 14
     PUSHBUTTON "削除(&R)", IDC_USERS_REMOVE, 141, 98, 50, 14
     PUSHBUTTON "プロパティ(&O)", IDC_USERS_PROPERTIES, 195, 98, 50, 14
-    AUTOCHECKBOX "ユーザー名とパスワードをシステム開始時に要求します(&Q)", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
+    AUTOCHECKBOX "ユーザー名とパスワードをシステム開始時に要求します(&Q)", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14
     PUSHBUTTON "パスワードのリセット(&E)", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED
 END
 
diff --git a/dll/cpl/usrmgr/lang/pl-PL.rc b/dll/cpl/usrmgr/lang/pl-PL.rc
index a7efa7a90c1..5129eee5476 100644
--- a/dll/cpl/usrmgr/lang/pl-PL.rc
+++ b/dll/cpl/usrmgr/lang/pl-PL.rc
@@ -22,7 +22,7 @@ BEGIN
     PUSHBUTTON "&Dodaj...", IDC_USERS_ADD, 87, 98, 50, 14
     PUSHBUTTON "&Usuń", IDC_USERS_REMOVE, 141, 98, 50, 14
     PUSHBUTTON "Właściw&ości", IDC_USERS_PROPERTIES, 195, 98, 50, 14
-    AUTOCHECKBOX "Wymagaj nazwy użytkownika i hasła przy starcie systemu.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
+    AUTOCHECKBOX "Wymagaj nazwy użytkownika i hasła przy starcie systemu.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14
     PUSHBUTTON "Resetuj hasło", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED
 END
 
diff --git a/dll/cpl/usrmgr/lang/pt-PT.rc b/dll/cpl/usrmgr/lang/pt-PT.rc
index 5be2a844497..ad426aa1a4b 100644
--- a/dll/cpl/usrmgr/lang/pt-PT.rc
+++ b/dll/cpl/usrmgr/lang/pt-PT.rc
@@ -19,7 +19,7 @@ BEGIN
     PUSHBUTTON "&Adicionar...", IDC_USERS_ADD, 87, 98, 50, 14
     PUSHBUTTON "&Remover", IDC_USERS_REMOVE, 141, 98, 50, 14
     PUSHBUTTON "Pr&opriedades", IDC_USERS_PROPERTIES, 195, 98, 50, 14
-    AUTOCHECKBOX "Requer um nome de utilizador e uma palavra-passe ao iniciar o sistema.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 240, 14, WS_DISABLED
+    AUTOCHECKBOX "Requer um nome de utilizador e uma palavra-passe ao iniciar o sistema.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 240, 14
     PUSHBUTTON "Redefinir palavra-passe", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED
 END
 
diff --git a/dll/cpl/usrmgr/lang/ro-RO.rc b/dll/cpl/usrmgr/lang/ro-RO.rc
index 82c3bb400f9..4c4fa0884fe 100644
--- a/dll/cpl/usrmgr/lang/ro-RO.rc
+++ b/dll/cpl/usrmgr/lang/ro-RO.rc
@@ -14,7 +14,7 @@ BEGIN
     PUSHBUTTON "A&dăugare…", IDC_USERS_ADD, 87, 98, 50, 14
     PUSHBUTTON "&Eliminare…", IDC_USERS_REMOVE, 141, 98, 50, 14
     PUSHBUTTON "&Proprietăți…", IDC_USERS_PROPERTIES, 195, 98, 50, 14
-    AUTOCHECKBOX "S&olicită la pornirea sistemului numele de utilizator și parola.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
+    AUTOCHECKBOX "S&olicită la pornirea sistemului numele de utilizator și parola.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14
     PUSHBUTTON "Destit&uie parola", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED
 END
 
diff --git a/dll/cpl/usrmgr/lang/ru-RU.rc b/dll/cpl/usrmgr/lang/ru-RU.rc
index 2f9fa115cae..169b14bfae5 100644
--- a/dll/cpl/usrmgr/lang/ru-RU.rc
+++ b/dll/cpl/usrmgr/lang/ru-RU.rc
@@ -12,7 +12,7 @@ BEGIN
     PUSHBUTTON "Добавить...", IDC_USERS_ADD, 87, 98, 50, 14
     PUSHBUTTON "Удалить", IDC_USERS_REMOVE, 141, 98, 50, 14
     PUSHBUTTON "Свойства", IDC_USERS_PROPERTIES, 195, 98, 50, 14
-    AUTOCHECKBOX "Требуется имя пользователя и пароль при загрузке системы", IDC_USERS_STARTUP_REQUIRE, 10, 118, 220, 14, WS_DISABLED
+    AUTOCHECKBOX "Требуется имя пользователя и пароль при загрузке системы", IDC_USERS_STARTUP_REQUIRE, 10, 118, 220, 14
     PUSHBUTTON "Сбросить пароль", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED
 END
 
diff --git a/dll/cpl/usrmgr/lang/tr-TR.rc b/dll/cpl/usrmgr/lang/tr-TR.rc
index 121606e5738..fb4b88f3c21 100644
--- a/dll/cpl/usrmgr/lang/tr-TR.rc
+++ b/dll/cpl/usrmgr/lang/tr-TR.rc
@@ -14,7 +14,7 @@ BEGIN
     PUSHBUTTON "&Ekle...", IDC_USERS_ADD, 87, 98, 50, 14
     PUSHBUTTON "&Sil", IDC_USERS_REMOVE, 141, 98, 50, 14
     PUSHBUTTON "Ö&zellikler", IDC_USERS_PROPERTIES, 195, 98, 50, 14
-    AUTOCHECKBOX "Sistemi &başlatmada kullanıcı adı ve parola gerektir.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
+    AUTOCHECKBOX "Sistemi &başlatmada kullanıcı adı ve parola gerektir.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14
     PUSHBUTTON "&Parolayı Değiştir", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED
 END
 
diff --git a/dll/cpl/usrmgr/lang/uk-UA.rc b/dll/cpl/usrmgr/lang/uk-UA.rc
index e667bbc5287..7ecfe249a32 100644
--- a/dll/cpl/usrmgr/lang/uk-UA.rc
+++ b/dll/cpl/usrmgr/lang/uk-UA.rc
@@ -12,7 +12,7 @@ BEGIN
     PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14
     PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14
     PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14
-    AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
+    AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14
     PUSHBUTTON "Reset Password", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED
 END
 
diff --git a/dll/cpl/usrmgr/lang/zh-CN.rc b/dll/cpl/usrmgr/lang/zh-CN.rc
index 26fd4921037..9ecf9fdd8b3 100644
--- a/dll/cpl/usrmgr/lang/zh-CN.rc
+++ b/dll/cpl/usrmgr/lang/zh-CN.rc
@@ -21,7 +21,7 @@ BEGIN
     PUSHBUTTON "添加...(&D)", IDC_USERS_ADD, 87, 98, 50, 14
     PUSHBUTTON "删除(&R)", IDC_USERS_REMOVE, 141, 98, 50, 14
     PUSHBUTTON "属性(&O)", IDC_USERS_PROPERTIES, 195, 98, 50, 14
-    AUTOCHECKBOX "在系统启动时需要用户名和密码。", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
+    AUTOCHECKBOX "在系统启动时需要用户名和密码。", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14
     PUSHBUTTON "重置密码", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED
 END
 
diff --git a/dll/cpl/usrmgr/lang/zh-HK.rc b/dll/cpl/usrmgr/lang/zh-HK.rc
index 559b3c03fb3..45af86282a2 100644
--- a/dll/cpl/usrmgr/lang/zh-HK.rc
+++ b/dll/cpl/usrmgr/lang/zh-HK.rc
@@ -20,7 +20,7 @@ BEGIN
     PUSHBUTTON "新增(&D)...", IDC_USERS_ADD, 87, 98, 50, 14
     PUSHBUTTON "移除(&R)", IDC_USERS_REMOVE, 141, 98, 50, 14
     PUSHBUTTON "內容(&O)", IDC_USERS_PROPERTIES, 195, 98, 50, 14
-    AUTOCHECKBOX "在系統啟動時需要使用者名稱和密碼。(&Q)", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
+    AUTOCHECKBOX "在系統啟動時需要使用者名稱和密碼。(&Q)", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14
     PUSHBUTTON "重設密碼(&E)", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED
 END
 
diff --git a/dll/cpl/usrmgr/lang/zh-TW.rc b/dll/cpl/usrmgr/lang/zh-TW.rc
index aa0ab2d0977..7b076d44e87 100644
--- a/dll/cpl/usrmgr/lang/zh-TW.rc
+++ b/dll/cpl/usrmgr/lang/zh-TW.rc
@@ -20,7 +20,7 @@ BEGIN
     PUSHBUTTON "新增(&D)...", IDC_USERS_ADD, 87, 98, 50, 14
     PUSHBUTTON "移除(&R)", IDC_USERS_REMOVE, 141, 98, 50, 14
     PUSHBUTTON "內容(&O)", IDC_USERS_PROPERTIES, 195, 98, 50, 14
-    AUTOCHECKBOX "在系統啟動時需要使用者名稱和密碼。(&Q)", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED
+    AUTOCHECKBOX "在系統啟動時需要使用者名稱和密碼。(&Q)", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14
     PUSHBUTTON "重設密碼(&E)", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED
 END
 
diff --git a/dll/cpl/usrmgr/users.c b/dll/cpl/usrmgr/users.c
index 5c785b6e48d..010c20cd672 100644
--- a/dll/cpl/usrmgr/users.c
+++ b/dll/cpl/usrmgr/users.c
@@ -15,6 +15,7 @@
  */
 
 #include "usrmgr.h"
+#include <winreg.h>
 
 typedef struct _USER_DATA
 {
@@ -650,6 +651,44 @@ UpdateUserProperties(HWND hwndDlg)
     NetApiBufferFree(pUserInfo);
 }
 
+VOID OnToggleRequireLogon(_In_ HWND hwndDlg)
+{
+    HKEY hKey;
+    LONG lResult;
+    BOOL bIsChecked;
+    PCWSTR pszAutoAdminLogonValue;
+
+    lResult = RegCreateKeyExW(HKEY_LOCAL_MACHINE,
+                              L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon",
+                              0,
+                              NULL,
+                              REG_OPTION_NON_VOLATILE,
+                              KEY_SET_VALUE,
+                              NULL,
+                              &hKey,
+                              NULL);
+    if (lResult != ERROR_SUCCESS)
+    {
+        ERR("OnToggleRequireLogon: Failed to open or create Winlogon registry key. Error code: %ld\n", lResult);
+        return; 
+    }
+
+    bIsChecked = IsDlgButtonChecked(hwndDlg, IDC_USERS_STARTUP_REQUIRE) == BST_CHECKED;
+    pszAutoAdminLogonValue = bIsChecked ? L"0" : L"1";
+
+    lResult = RegSetValueExW(hKey,
+                             L"AutoAdminLogon",
+                             0,
+                             REG_SZ, 
+                             (const BYTE*)pszAutoAdminLogonValue,
+                             2 * sizeof(WCHAR));
+    if (lResult != ERROR_SUCCESS)
+    {
+        ERR("OnToggleRequireLogon: Failed to set AutoAdminLogon registry value. Error code: %ld\n", lResult);
+    }
+
+    RegCloseKey(hKey);
+}
 
 INT_PTR CALLBACK
 UsersPageProc(HWND hwndDlg,
@@ -666,16 +705,50 @@ UsersPageProc(HWND hwndDlg,
     switch (uMsg)
     {
         case WM_INITDIALOG:
-            pUserData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(USER_DATA));
+        {
+            LONG lResult;
+            HKEY hKey;
+            WCHAR szAutoAdminLogonValue[2];
+            DWORD dwType;
+            DWORD dwSize = sizeof(szAutoAdminLogonValue);
+            BOOL bRequireLogon = TRUE;
+
+            pUserData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pUserData));
             SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pUserData);
 
             pUserData->hPopupMenu = LoadMenu(hApplet, MAKEINTRESOURCE(IDM_POPUP_USER));
 
             OnInitDialog(hwndDlg);
+            lResult = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+                                    L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon",
+                                    0, KEY_READ, &hKey);
+            if (lResult != ERROR_SUCCESS)
+            {
+                CheckDlgButton(hwndDlg, IDC_USERS_STARTUP_REQUIRE, BST_CHECKED);
+                break; 
+            }
+
+            lResult = RegQueryValueExW(hKey,
+                                       L"AutoAdminLogon",
+                                       NULL,
+                                       &dwType,
+                                       (LPBYTE)szAutoAdminLogonValue,
+                                       &dwSize);
+            RegCloseKey(hKey);
+
+            if (lResult == ERROR_SUCCESS && dwType == REG_SZ &&
+                wcscmp(szAutoAdminLogonValue, L"1") == 0)
+            {
+                bRequireLogon = FALSE;
+            }
+
+            CheckDlgButton(hwndDlg, IDC_USERS_STARTUP_REQUIRE, bRequireLogon ? BST_CHECKED : BST_UNCHECKED);
+
             SetMenuDefaultItem(GetSubMenu(pUserData->hPopupMenu, 1),
                                IDM_USER_PROPERTIES,
                                FALSE);
             break;
+        }
 
         case WM_COMMAND:
             switch (LOWORD(wParam))
@@ -705,6 +778,9 @@ UsersPageProc(HWND hwndDlg,
                         UpdateUserProperties(hwndDlg);
                     }
                     break;
+                case IDC_USERS_STARTUP_REQUIRE:
+                    OnToggleRequireLogon(hwndDlg);
+                    break;
             }
             break;