diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc
index 01e2c9c0023..5bde6515144 100644
--- a/dll/win32/shell32/lang/bg-BG.rc
+++ b/dll/win32/shell32/lang/bg-BG.rc
@@ -356,23 +356,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Изпълняване като"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "От чия потребителска сметка искате да изпълните приложението?", -1, 10, 20, 220, 20
-    CHECKBOX "Сегашен потребител %s", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "Сегашен потребител %s", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "Защита на компютъра и данните от неупълномощена дейност на приложенията", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "Този избор може да попречи на вирусите да повредят компютъра или данните ви, но може и да попречи на редовната работа на приложението.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "Следният потребител:", 14002, 10, 100, 90, 10
+    AUTORADIOBUTTON "Следният потребител:", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "Потребител:", -1, 20, 115, 60, 10
-    COMBOBOX 14003, 70, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 70, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "Парола:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "Добре", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Отказ", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "Добре", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Отказ", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc
index 5f2aaa48cc7..d0af78fbef9 100644
--- a/dll/win32/shell32/lang/ca-ES.rc
+++ b/dll/win32/shell32/lang/ca-ES.rc
@@ -356,23 +356,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Run As"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20
-    CHECKBOX "Current User %s", 14000, 10, 45, 150, 10
-    LTEXT "Protect my computer and data from unauthorized program activity", -1, 25, 57, 200, 10, WS_DISABLED
-    CHECKBOX "This option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "The following user:", 14002, 10, 100, 90, 10
+    ICON IDI_SHELL_SECURITY, -1, 8, 8, 21, 20
+    LTEXT "Which user account do you want to use to run this program?", -1, 35, 14, 200, 15
+    AUTORADIOBUTTON "&Current User %s", IDC_RUNAS_THIS, 8, 35, 150, 10, WS_GROUP
+    AUTOCHECKBOX "Protect my computer and data from unauthorized program activity\n\nThis option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", IDC_RUNAS_SAFER, 18, 47, 205, 50, WS_DISABLED | WS_TABSTOP | BS_MULTILINE | BS_TOP
+    AUTORADIOBUTTON "The &following user:", IDC_RUNAS_OTHER, 8, 100, 90, 10
     LTEXT "User name:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 110, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "...", IDC_RUNAS_BROWSE, 190, 115, 20, 14, WS_TABSTOP
     LTEXT "Password:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 75, 140, 110, 14, ES_LEFT | ES_PASSWORD | WS_BORDER
+    DEFPUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Cancel", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc
index 8af5dce9338..745d14de8f5 100644
--- a/dll/win32/shell32/lang/cs-CZ.rc
+++ b/dll/win32/shell32/lang/cs-CZ.rc
@@ -362,23 +362,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Spustit jako"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Jaký uživatelský účet chcete použít ke spuštění tohoto programu?", -1, 10, 20, 220, 20
-    CHECKBOX "Současný uživatel: %s", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "Současný uživatel: %s", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "Chránit počítač a data před nedovolenou aktivitou programu", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "Tato volba může zabránit počítačovým virům v poškození vašeho počítače nebo osobních dat, ale její vybrání může způsobit nesprávné fungování programu.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "Následující uživatel:", 14002, 10, 100, 90, 10
+    AUTORADIOBUTTON "Následující uživatel:", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "Uživatelské jméno:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "Heslo:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Storno", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Storno", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc
index a2a8a198f60..0a627b11f1b 100644
--- a/dll/win32/shell32/lang/da-DK.rc
+++ b/dll/win32/shell32/lang/da-DK.rc
@@ -362,23 +362,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Run As"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20
-    CHECKBOX "Current User %s", 14000, 10, 45, 150, 10
-    LTEXT "Protect my computer and data from unauthorized program activity", -1, 25, 57, 200, 10, WS_DISABLED
-    CHECKBOX "This option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "The following user:", 14002, 10, 100, 90, 10
+    ICON IDI_SHELL_SECURITY, -1, 8, 8, 21, 20
+    LTEXT "Which user account do you want to use to run this program?", -1, 35, 14, 200, 15
+    AUTORADIOBUTTON "&Current User %s", IDC_RUNAS_THIS, 8, 35, 150, 10, WS_GROUP
+    AUTOCHECKBOX "Protect my computer and data from unauthorized program activity\n\nThis option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", IDC_RUNAS_SAFER, 18, 47, 205, 50, WS_DISABLED | WS_TABSTOP | BS_MULTILINE | BS_TOP
+    AUTORADIOBUTTON "The &following user:", IDC_RUNAS_OTHER, 8, 100, 90, 10
     LTEXT "User name:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 110, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "...", IDC_RUNAS_BROWSE, 190, 115, 20, 14, WS_TABSTOP
     LTEXT "Password:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 75, 140, 110, 14, ES_LEFT | ES_PASSWORD | WS_BORDER
+    DEFPUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Cancel", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc
index cfe026ee4c9..c0fbc02eccc 100644
--- a/dll/win32/shell32/lang/de-DE.rc
+++ b/dll/win32/shell32/lang/de-DE.rc
@@ -356,23 +356,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ausführen als"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Welches Benutzerkonto wollen Sie zum Starten dieser Anwendung verwenden?", -1, 10, 20, 220, 20
-    CHECKBOX "Aktueller Benutzer %s", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "Aktueller Benutzer %s", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "Computer vor unautorisierten Programmaktivitäten schützen", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "Diese Einstellung kann Computerviren daran hindern, ihrem Computer oder Ihren persönlichen Daten zu schaden, aber es kann auch Programme daran hindern, ordnungsgemäß zu arbeiten.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "Folgender Benutzer:", 14002,  10, 100, 90, 10
+    AUTORADIOBUTTON "Folgender Benutzer:", IDC_RUNAS_OTHER,  10, 100, 90, 10
     LTEXT "Benutzername:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "Passwort:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Abbrechen", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Abbrechen", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc
index a191eb18ce0..ef10c772f0f 100644
--- a/dll/win32/shell32/lang/el-GR.rc
+++ b/dll/win32/shell32/lang/el-GR.rc
@@ -356,23 +356,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Εκτέλεση ώς"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Επιλέξτε ποιός λογαριασμός χρήστη θέλετε να τρέξει αυτό το πρόγραμμα", -1, 10, 20, 220, 20
-    CHECKBOX "Τρέχον χρήστης %s", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "Τρέχον χρήστης %s", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "Προστασία του υπολογιστή απο μη εξουσιοδοτημένες ενέργειες προγραμμάτων", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "Αυτή η επιλογή μπορεί να αποτρέψει ιούς να βλάψουν τον υπολογιστή σας αλλά επιλέγοντάς το μπορεί να κάνει κάποια προγράμματα να μην λειτουργούν σωστά.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "Ο παρακάτω χρήστης:", 14002, 10, 100, 90, 10
+    AUTORADIOBUTTON "Ο παρακάτω χρήστης:", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "Όνομα χρήστη:", -1, 20, 115, 60, 10
-    COMBOBOX 14003, 70, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 70, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 10, WS_TABSTOP
     LTEXT "Κωδικός πρόσβασης:", -1, 20, 140, 60, 10
-    EDITTEXT 14005, 70, 140, 100, 10, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 10, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 70, 170, 60, 15, WS_TABSTOP
-    PUSHBUTTON "Άκυρο", 14008, 140, 170, 60, 15, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 70, 140, 100, 10, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "OK", IDOK, 70, 170, 60, 15, WS_TABSTOP
+    PUSHBUTTON "Άκυρο", IDCANCEL, 140, 170, 60, 15, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc
index c4df603d9b2..4a7c2fad623 100644
--- a/dll/win32/shell32/lang/en-GB.rc
+++ b/dll/win32/shell32/lang/en-GB.rc
@@ -356,23 +356,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Run As"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20
-    CHECKBOX "Current User %s", 14000, 10, 45, 150, 10
-    LTEXT "Protect my computer and data from unauthorised program activity", -1, 25, 57, 200, 10, WS_DISABLED
-    CHECKBOX "This option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "The following user:", 14002, 10, 100, 90, 10
+    ICON IDI_SHELL_SECURITY, -1, 8, 8, 21, 20
+    LTEXT "Which user account do you want to use to run this program?", -1, 35, 14, 200, 15
+    AUTORADIOBUTTON "&Current User %s", IDC_RUNAS_THIS, 8, 35, 150, 10, WS_GROUP
+    AUTOCHECKBOX "Protect my computer and data from unauthorized program activity\n\nThis option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", IDC_RUNAS_SAFER, 18, 47, 205, 50, WS_DISABLED | WS_TABSTOP | BS_MULTILINE | BS_TOP
+    AUTORADIOBUTTON "The &following user:", IDC_RUNAS_OTHER, 8, 100, 90, 10
     LTEXT "User name:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 110, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "...", IDC_RUNAS_BROWSE, 190, 115, 20, 14, WS_TABSTOP
     LTEXT "Password:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 75, 140, 110, 14, ES_LEFT | ES_PASSWORD | WS_BORDER
+    DEFPUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Cancel", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc
index dc666d4a21b..125e77ea36c 100644
--- a/dll/win32/shell32/lang/en-US.rc
+++ b/dll/win32/shell32/lang/en-US.rc
@@ -356,23 +356,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Run As"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20
-    CHECKBOX "Current User %s", 14000, 10, 45, 150, 10
-    LTEXT "Protect my computer and data from unauthorized program activity", -1, 25, 57, 200, 10, WS_DISABLED
-    CHECKBOX "This option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "The following user:", 14002, 10, 100, 90, 10
+    ICON IDI_SHELL_SECURITY, -1, 8, 8, 21, 20
+    LTEXT "Which user account do you want to use to run this program?", -1, 35, 14, 200, 15
+    AUTORADIOBUTTON "&Current User %s", IDC_RUNAS_THIS, 8, 35, 150, 10, WS_GROUP
+    AUTOCHECKBOX "Protect my computer and data from unauthorized program activity\n\nThis option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", IDC_RUNAS_SAFER, 18, 47, 205, 50, WS_DISABLED | WS_TABSTOP | BS_MULTILINE | BS_TOP
+    AUTORADIOBUTTON "The &following user:", IDC_RUNAS_OTHER, 8, 100, 90, 10
     LTEXT "User name:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 110, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "...", IDC_RUNAS_BROWSE, 190, 115, 20, 14, WS_TABSTOP
     LTEXT "Password:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 75, 140, 110, 14, ES_LEFT | ES_PASSWORD | WS_BORDER
+    DEFPUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Cancel", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc
index c455913d518..79f96bd49f2 100644
--- a/dll/win32/shell32/lang/es-ES.rc
+++ b/dll/win32/shell32/lang/es-ES.rc
@@ -365,23 +365,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ejecutar como"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "¿Qué cuenta de usuario desea usar para ejecutar este programa?", -1, 10, 20, 220, 20
-    CHECKBOX "Usuario actual %s", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "Usuario actual %s", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "Proteger mi equipo y mis datos contra la actividad de programas sin autorización", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "Esta opción puede impedir que virus informáticos dañen su equipo o sus datos personales, pero si la selecciona es posible que el programa no funcione correctamente.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "El siguiente usuario:", 14002, 10, 100, 90, 10
+    AUTORADIOBUTTON "El siguiente usuario:", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "Usuario:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "Contraseña:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "Aceptar", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Cancelar", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "Aceptar", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Cancelar", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc
index 82ba06904c7..b73270a77ba 100644
--- a/dll/win32/shell32/lang/et-EE.rc
+++ b/dll/win32/shell32/lang/et-EE.rc
@@ -363,23 +363,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Käivita teise kasutajana"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Millise kasutajakonto abil soovite selle programmi käivitada?", -1, 10, 20, 220, 20
-    CHECKBOX "Praegune kasutaja %s", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "Praegune kasutaja %s", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "Kaitse minu arvutit ja andmeid volitamata programmitegevuse eest", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "See suvand võib takistada arvutiviirusi Sinu arvutit või andmeid kahjustamast, kuid selle valimine võib põhjustada programmi valesti töötamist.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "Järgmine kasutaja:", 14002, 10, 100, 90, 10
+    AUTORADIOBUTTON "Järgmine kasutaja:", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "Kasutajanimi:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "Parool:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Loobu", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Loobu", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/eu-ES.rc b/dll/win32/shell32/lang/eu-ES.rc
index aae6824a530..68685dbbbad 100644
--- a/dll/win32/shell32/lang/eu-ES.rc
+++ b/dll/win32/shell32/lang/eu-ES.rc
@@ -363,23 +363,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Exekutatu honela..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Zein erabiltzaile-kontu erabili nahi duzu programa hau exekutatzeko?", -1, 10, 20, 220, 20
-    CHECKBOX "&Uneko erabiltzailea %s", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "&Uneko erabiltzailea %s", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "&Babestu ordenagailua baimendu gabeko programa-jardueren kontra.", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "Aukera honek birusek ordenagailuari edo datu pertsonalei kalte egitea eragotziko du, baina agian programak ez du ondo funtzionatuko.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "&Erabiltzaile hau:", 14002, 10, 100, 90, 10
+    AUTORADIOBUTTON "&Erabiltzaile hau:", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "Erabiltzaile:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "Pasahitza:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "Ados", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Utzi", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "Ados", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Utzi", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc
index 5da33435d2e..fc4dc38108a 100644
--- a/dll/win32/shell32/lang/fi-FI.rc
+++ b/dll/win32/shell32/lang/fi-FI.rc
@@ -356,23 +356,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Run As"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20
-    CHECKBOX "Current User %s", 14000, 10, 45, 150, 10
-    LTEXT "Protect my computer and data from unauthorized program activity", -1, 25, 57, 200, 10, WS_DISABLED
-    CHECKBOX "This option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "The following user:", 14002, 10, 100, 90, 10
+    ICON IDI_SHELL_SECURITY, -1, 8, 8, 21, 20
+    LTEXT "Which user account do you want to use to run this program?", -1, 35, 14, 200, 15
+    AUTORADIOBUTTON "&Current User %s", IDC_RUNAS_THIS, 8, 35, 150, 10, WS_GROUP
+    AUTOCHECKBOX "Protect my computer and data from unauthorized program activity\n\nThis option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", IDC_RUNAS_SAFER, 18, 47, 205, 50, WS_DISABLED | WS_TABSTOP | BS_MULTILINE | BS_TOP
+    AUTORADIOBUTTON "The &following user:", IDC_RUNAS_OTHER, 8, 100, 90, 10
     LTEXT "User name:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 110, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "...", IDC_RUNAS_BROWSE, 190, 115, 20, 14, WS_TABSTOP
     LTEXT "Password:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 75, 140, 110, 14, ES_LEFT | ES_PASSWORD | WS_BORDER
+    DEFPUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Cancel", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc
index 02c79aa67c6..c2cbd38c38a 100644
--- a/dll/win32/shell32/lang/fr-FR.rc
+++ b/dll/win32/shell32/lang/fr-FR.rc
@@ -356,23 +356,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Exécuter en tant que"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Quel compte d'utilisateur désirez-vous utiliser pour lancer ce programme?", -1, 10, 20, 220, 20
-    CHECKBOX "Utilisateur actuel %s", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "Utilisateur actuel %s", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "Protéger mon ordinateur et mes données des activités des programmes non autorisés", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "Cette option peut empêcher les virus d'ordinateur d'endommager votre ordinateur ou vos données personnelles, néanmoins sélectionner cette option pourrait empêcher le programme de fonctionner correctement.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "L'utilisateur suivant :", 14002, 10, 100, 90, 10
+    AUTORADIOBUTTON "L'utilisateur suivant :", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "Nom d'utilisateur :", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "Mot de passe :", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Annuler", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Annuler", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc
index 197e6a853fa..aec1e634b2e 100644
--- a/dll/win32/shell32/lang/he-IL.rc
+++ b/dll/win32/shell32/lang/he-IL.rc
@@ -358,23 +358,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "הפעל בתור-"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "באיזה חשבון משתמש ברצונך להשתמש כדי להפעיל תוכנית זו?", -1, 10, 20, 220, 20
-    CHECKBOX "המשתמש הנוכחי %s", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "המשתמש הנוכחי %s", IDC_RUNAS_THIS, 10, 45, 150, 10
     LTEXT "Protect my computer and data from unauthorized program activity", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "This option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "המשתמש הבא:", 14002, 10, 100, 90, 10
+    AUTORADIOBUTTON "המשתמש הבא:", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "שם משתמש:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "...", IDC_RUNAS_BROWSE, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "סיסמה:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "אישור", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "ביטול", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "אישור", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "ביטול", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc
index 1e22c50b0d8..c1a2ececb4b 100644
--- a/dll/win32/shell32/lang/hi-IN.rc
+++ b/dll/win32/shell32/lang/hi-IN.rc
@@ -363,7 +363,7 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "रन ऐज़"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
@@ -371,13 +371,12 @@ BEGIN
     CHECKBOX "मौजूदा यूज़र %s", 14000, 10, 45, 150, 10
     LTEXT "अनधिकृत प्रोग्राम गतिविधि से अपने कंप्यूटर और डेटा को सुरक्षित रखें", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "यह विकल्प कंप्यूटर वायरस को आपके कंप्यूटर या व्यक्तिगत डेटा को नुकसान पहुंचाने से रोक सकता है, लेकिन इसे चुनने से प्रोग्राम अनुचित तरीके से कार्य कर सकता है।", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "निम्नलिखित यूज़र :", 14002, 10, 100, 90, 10
+    CHECKBOX "निम्नलिखित यूज़र :", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "यूज़र नेम:", -1, 20, 118, 54, 10
     COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "पासवर्ड:", -1, 20, 143, 53, 10
     EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
     PUSHBUTTON "ओके", 14007, 57, 170, 60, 14, WS_TABSTOP
     PUSHBUTTON "रद्द करें", 14008, 122, 170, 60, 14, WS_TABSTOP
 END
diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc
index 28c4cbe7cb9..ee954ba4922 100644
--- a/dll/win32/shell32/lang/hu-HU.rc
+++ b/dll/win32/shell32/lang/hu-HU.rc
@@ -356,23 +356,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Futtatás mint"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Melyik felhasználói fiók használatával akarja futtatni ezt a programot?", -1, 10, 20, 220, 20
-    CHECKBOX "Jelenlegi felhasználó %s", 14000, 10, 40, 150, 10
+    AUTORADIOBUTTON "Jelenlegi felhasználó %s", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "A számítógép és az adatok védelme jogosulatlan programtevékenységek ellen.", -1, 25, 50, 200, 16, WS_DISABLED
     CHECKBOX "Ez a beállítás meg tudja akadályozni hogy számítógépes vírusok kárt tegyenek a számítógépében vagy a személyes adataiban, de ezt választva lehet hogy a program nem fog megfelelően működni.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "A következő felhasználó:", 14002, 10, 100, 90, 10
+    AUTORADIOBUTTON "A következő felhasználó:", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "Felhasználónév:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "Jelszó:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Mégse", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Mégse", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc
index 661dac1ccd0..8260738c49e 100644
--- a/dll/win32/shell32/lang/id-ID.rc
+++ b/dll/win32/shell32/lang/id-ID.rc
@@ -356,23 +356,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Jalankan Sebagai"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Akun pengguna mana yang ingin anda gunakan untuk menjalankan program ini?", -1, 10, 20, 220, 20
-    CHECKBOX "Pengguna Saat Ini %s", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "Pengguna Saat Ini %s", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "Lindungi komputer dan data dari aktivitas program tanpa izin", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "Opsi ini dapat mencegah virus komputer yang dapat membahayakan komputer atau data pribadi Anda, tetapi memilihnya dapat menyebabkan program berfungsi tidak semestinya.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "Pengguna berikut:", 14002, 10, 100, 90, 10
+    AUTORADIOBUTTON "Pengguna berikut:", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "Nama pengguna:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "Kata Sandi:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Batal", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Batal", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc
index 32189f8de8e..05cb1d5bd81 100644
--- a/dll/win32/shell32/lang/it-IT.rc
+++ b/dll/win32/shell32/lang/it-IT.rc
@@ -356,23 +356,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Esegui come"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Quale utente volete utilizzare per l'esecuzione di questo programma?", -1, 10, 20, 220, 20
-    CHECKBOX "Utente attuale %s", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "Utente attuale %s", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "Proteggere il computer e i dati da attività del programma non autorizzate", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "Questa opzione può prevenire i danni causati da virus del computer ma potrebbe impedire il corretto funzionamento del programma.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "L'utente seguente:", 14002, 10, 100, 90, 10
+    AUTORADIOBUTTON "L'utente seguente:", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "Utente:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "Password:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Annulla", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Annulla", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc
index 7cf8c34729f..dde64e5e1cd 100644
--- a/dll/win32/shell32/lang/ja-JP.rc
+++ b/dll/win32/shell32/lang/ja-JP.rc
@@ -356,23 +356,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "別のユーザーとして実行"
 FONT 9, "MS UI Gothic", 0, 0, 0x0
 BEGIN
     LTEXT "このプログラムを実行するユーザーアカウントを選択してください", -1, 10, 20, 220, 20
-    CHECKBOX "現在のユーザー (%s)", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "現在のユーザー (%s)", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "許可されていないプログラムの活動からコンピュータとデータを保護する", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "このオプションはコンピュータや個人データに危害をもたらすコンピュータウイルスを未然に防止することができます。ただし、このオプションを選択するとプログラムが正常に機能しなくなる可能性があります。", 14001, 25, 68, 210, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "次のユーザー:", 14002, 10, 100, 90, 10
+    AUTORADIOBUTTON "次のユーザー:", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "ユーザー名:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "パスワード:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "キャンセル", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "キャンセル", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc
index fdbc263ae98..bcf884e3875 100644
--- a/dll/win32/shell32/lang/ko-KR.rc
+++ b/dll/win32/shell32/lang/ko-KR.rc
@@ -363,23 +363,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "다음 계정으로 실행"
 FONT 9, "굴림", 0, 0, 0x1
 BEGIN
-    LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20
-    CHECKBOX "Current User %s", 14000, 10, 45, 150, 10
-    LTEXT "Protect my computer and data from unauthorized program activity", -1, 25, 57, 200, 10, WS_DISABLED
-    CHECKBOX "This option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "The following user:", 14002, 10, 100, 90, 10
+    ICON IDI_SHELL_SECURITY, -1, 8, 8, 21, 20
+    LTEXT "Which user account do you want to use to run this program?", -1, 35, 14, 200, 15
+    AUTORADIOBUTTON "&Current User %s", IDC_RUNAS_THIS, 8, 35, 150, 10, WS_GROUP
+    AUTOCHECKBOX "Protect my computer and data from unauthorized program activity\n\nThis option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", IDC_RUNAS_SAFER, 18, 47, 205, 50, WS_DISABLED | WS_TABSTOP | BS_MULTILINE | BS_TOP
+    AUTORADIOBUTTON "The &following user:", IDC_RUNAS_OTHER, 8, 100, 90, 10
     LTEXT "User name:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 110, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "...", IDC_RUNAS_BROWSE, 190, 115, 20, 14, WS_TABSTOP
     LTEXT "Password:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 75, 140, 110, 14, ES_LEFT | ES_PASSWORD | WS_BORDER
+    DEFPUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Cancel", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc
index fca4d439f46..e88e31360fb 100644
--- a/dll/win32/shell32/lang/nl-NL.rc
+++ b/dll/win32/shell32/lang/nl-NL.rc
@@ -356,23 +356,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Run As"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20
-    CHECKBOX "Current User %s", 14000, 10, 45, 150, 10
-    LTEXT "Protect my computer and data from unauthorized program activity", -1, 25, 57, 200, 10, WS_DISABLED
-    CHECKBOX "This option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "The following user:", 14002, 10, 100, 90, 10
+    ICON IDI_SHELL_SECURITY, -1, 8, 8, 21, 20
+    LTEXT "Which user account do you want to use to run this program?", -1, 35, 14, 200, 15
+    AUTORADIOBUTTON "&Current User %s", IDC_RUNAS_THIS, 8, 35, 150, 10, WS_GROUP
+    AUTOCHECKBOX "Protect my computer and data from unauthorized program activity\n\nThis option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", IDC_RUNAS_SAFER, 18, 47, 205, 50, WS_DISABLED | WS_TABSTOP | BS_MULTILINE | BS_TOP
+    AUTORADIOBUTTON "The &following user:", IDC_RUNAS_OTHER, 8, 100, 90, 10
     LTEXT "User name:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 110, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "...", IDC_RUNAS_BROWSE, 190, 115, 20, 14, WS_TABSTOP
     LTEXT "Password:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 75, 140, 110, 14, ES_LEFT | ES_PASSWORD | WS_BORDER
+    DEFPUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Cancel", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc
index 07aaf2547e6..02f6b530b97 100644
--- a/dll/win32/shell32/lang/no-NO.rc
+++ b/dll/win32/shell32/lang/no-NO.rc
@@ -356,23 +356,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Kjør som"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Hvilken brukerkonto vil du bruke for å kjøre dette programmet?", -1, 10, 20, 220, 20
-    CHECKBOX "Følgende bruker %s", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "Følgende bruker %s", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "Beskytt min datamaskin og data fra uautorisert program aktivitet", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "Dette valget kan forebygge data virus fra å uskadeliggjøre din datamaskin eller personlige data, men utvelging det skulle kanskje forårsake program til funksjon formatfeil.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "Følgende bruker:", 14002, 10, 100, 90, 10
+    AUTORADIOBUTTON "Følgende bruker:", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "Brukernavn:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "Passord:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Avbryt", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Avbryt", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc
index 6f0eeef2235..9bf7dd07f24 100644
--- a/dll/win32/shell32/lang/pl-PL.rc
+++ b/dll/win32/shell32/lang/pl-PL.rc
@@ -362,23 +362,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Uruchom jako"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Które konto użytkownika chcesz użyć do uruchomienia tego programu?", -1, 10, 15, 220, 16
-    CHECKBOX "Bieżący użytkownik %s", 14000, 10, 40, 178, 10
+    AUTORADIOBUTTON "Bieżący użytkownik %s", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "Zabezpiecz mój komputer i dane przed nieautoryzowanym działaniem programów.", -1, 25, 52, 200, 16, WS_DISABLED
     CHECKBOX "Ta opcja może zabezpieczyć twój komputer lub dane na nim przed szkodliwymi programami, ale użycie jej może spowodować nieprawidłowe działanie programów.", 14001, 25, 69, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "Następujący użytkownik:", 14002, 10, 101, 97, 10
+    AUTORADIOBUTTON "Następujący użytkownik:", IDC_RUNAS_OTHER, 10, 101, 97, 10
     LTEXT "Nazwa użytkownika:", -1, 20, 119, 74, 10
-    COMBOBOX 14003, 95, 116, 80, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 95, 116, 80, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 116, 30, 14, WS_TABSTOP
     LTEXT "Hasło:", -1, 20, 144, 53, 10
-    EDITTEXT 14005, 95, 141, 80, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 141, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Anuluj", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 95, 141, 80, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Anuluj", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc
index d610d4a66f1..09271264269 100644
--- a/dll/win32/shell32/lang/pt-BR.rc
+++ b/dll/win32/shell32/lang/pt-BR.rc
@@ -356,23 +356,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Executar Como"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Qual conta de usuário você deseja usar para executar este programa?", -1, 10, 20, 220, 20
-    CHECKBOX "Usuário Atual %s", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "Usuário Atual %s", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "Proteger meu computador e dados de atividade de programas não autorizados", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "Esta opção pode previnir vírus de computador de prejudicar o seu computador ou dados pessoais, mas selecionando esta opção pode causar mal funcionamento do programa.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "O seguinte usuário:", 14002, 10, 100, 90, 10
+    AUTORADIOBUTTON "O seguinte usuário:", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "Nome do usuário:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "Senha:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Cancelar", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Cancelar", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc
index 35a71da2a44..9f64539342b 100644
--- a/dll/win32/shell32/lang/pt-PT.rc
+++ b/dll/win32/shell32/lang/pt-PT.rc
@@ -356,23 +356,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Executar como"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Que conta de utilizador quer utilizar para executar este programa?", -1, 10, 20, 220, 20
-    CHECKBOX "Utilizador actual %s", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "Utilizador actual %s", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "Proteger o meu computador e dados de actividade de programas não autoridados.", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "Esta opção pode prevenir a acção de virus no computador, mas seleccionando-a pode levar a que alguns programas funcionem incorrectamente.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "O seguinte utilizador:", 14002, 10, 100, 90, 10
+    AUTORADIOBUTTON "O seguinte utilizador:", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "Nome do utilizador:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "Palavra-passe:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Cancelar", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Cancelar", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc
index fa976a2f9fe..425187264a7 100644
--- a/dll/win32/shell32/lang/ro-RO.rc
+++ b/dll/win32/shell32/lang/ro-RO.rc
@@ -359,23 +359,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Executare ca"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Ce cont de utilizator este folosit pentru a executa?", -1, 10, 20, 220, 20
-    CHECKBOX "Utilizator curent: %s", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "Utilizator curent: %s", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "Protejare calculator de activiăți neautorizate", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "Această opțiune vă poate proteja calculatorul de activități care pot fi dăunătoare dar poate de asemenea duce la funcționarea incorectă a programului.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "Următorul utilizator:", 14002, 10, 100, 90, 10
+    AUTORADIOBUTTON "Următorul utilizator:", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "Nume utilizator:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "…", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "Parolă:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "…", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "Con&firmă", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "A&nulează", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "Con&firmă", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "A&nulează", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc
index 4b2d22971d9..b33c9b489af 100644
--- a/dll/win32/shell32/lang/ru-RU.rc
+++ b/dll/win32/shell32/lang/ru-RU.rc
@@ -363,23 +363,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Запустить от другого пользователя"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "От имени какого пользователя вы хотите запустить программу?", -1, 10, 20, 220, 20
-    CHECKBOX "Текущий пользователь %s", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "Текущий пользователь %s", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "Защитить мой компьютер и данные от несанкционированной деятельности программ.", -1, 25, 57, 210, 10, WS_DISABLED /* FIXME Не влезает в рамки */
     CHECKBOX "Данная опция может защитить ваш компьютер и данные от вирусов, но программа может работать неправильно", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "Запустить от указанного пользователя:", 14002, 10, 100, 175, 10
+    AUTORADIOBUTTON "Запустить от указанного пользователя:", IDC_RUNAS_OTHER, 10, 100, 175, 10
     LTEXT "Пользователь:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "Пароль:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Отмена", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Отмена", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc
index bcc4af294ce..b13257befb1 100644
--- a/dll/win32/shell32/lang/sk-SK.rc
+++ b/dll/win32/shell32/lang/sk-SK.rc
@@ -356,23 +356,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Spustiť ako"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Ktoré používateľské konto chcete použiť k spusteniu tohto programu?", -1, 10, 20, 220, 20
-    CHECKBOX "Aktuálny používateľ %s", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "Aktuálny používateľ %s", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "Chrániť počítač a údaje pred neoprávnenými aktivitami programu", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "Táto možnosť môže zabrániť počítačovým vírusom aby poškodili počítač alebo osobné údaje, ale jej zvolenie môže spôsobiť, že program nebude správne fungovať.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "Nasledujúci používateľ:", 14002, 10, 100, 90, 10
+    AUTORADIOBUTTON "Nasledujúci používateľ:", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "Meno používateľa:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "Heslo:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Zrušiť", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Zrušiť", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc
index d8ae90a55af..2ea048c963e 100644
--- a/dll/win32/shell32/lang/sl-SI.rc
+++ b/dll/win32/shell32/lang/sl-SI.rc
@@ -356,23 +356,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Run As"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20
-    CHECKBOX "Current User %s", 14000, 10, 45, 150, 10
-    LTEXT "Protect my computer and data from unauthorized program activity", -1, 25, 57, 200, 10, WS_DISABLED
-    CHECKBOX "This option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "The following user:", 14002, 10, 100, 90, 10
+    ICON IDI_SHELL_SECURITY, -1, 8, 8, 21, 20
+    LTEXT "Which user account do you want to use to run this program?", -1, 35, 14, 200, 15
+    AUTORADIOBUTTON "&Current User %s", IDC_RUNAS_THIS, 8, 35, 150, 10, WS_GROUP
+    AUTOCHECKBOX "Protect my computer and data from unauthorized program activity\n\nThis option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", IDC_RUNAS_SAFER, 18, 47, 205, 50, WS_DISABLED | WS_TABSTOP | BS_MULTILINE | BS_TOP
+    AUTORADIOBUTTON "The &following user:", IDC_RUNAS_OTHER, 8, 100, 90, 10
     LTEXT "User name:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 110, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "...", IDC_RUNAS_BROWSE, 190, 115, 20, 14, WS_TABSTOP
     LTEXT "Password:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Cancel", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 75, 140, 110, 14, ES_LEFT | ES_PASSWORD | WS_BORDER
+    DEFPUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Cancel", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc
index 408a46ee2f5..6f38872502a 100644
--- a/dll/win32/shell32/lang/sq-AL.rc
+++ b/dll/win32/shell32/lang/sq-AL.rc
@@ -360,23 +360,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ekzekuto Si"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Cila llogari përdoruese doni të përdorni për të ekzekutuar këtë program?", -1, 10, 20, 220, 20
-    CHECKBOX "Përdoruesi tanishme %s", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "Përdoruesi tanishme %s", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "Mbroni kompjuterin tim dhe të dhëna nga aktiviteti i paautorizuar i programit", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "Ky opsion mund të parandaloi viruset kompjuterike që dëmtojnë kompjuterin tuaj personal ose të dhënat, por zgjedhja e programit mund të shkaktojë funksionim në mënyrë të paligjshme.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "Përdorues në vijim:", 14002, 10, 100, 90, 10
+    AUTORADIOBUTTON "Përdorues në vijim:", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "Përdoruesi:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "Fjalëkalimi:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Anulo", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Anulo", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc
index e00a5433304..706b8f286a3 100644
--- a/dll/win32/shell32/lang/sv-SE.rc
+++ b/dll/win32/shell32/lang/sv-SE.rc
@@ -356,23 +356,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Kör som"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Vilket användarkonto vill du använda för att köra det här programmet?", -1, 10, 20, 220, 20
-    CHECKBOX "Nuvarande användare %s", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "Nuvarande användare %s", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "Skydda min dator från otillåten programaktivitet", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "Det här alternativet kan hindra virus från att skada din dator eller personliga data, men kan orsaka att programmet inte fungerar korrekt.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "Följande användare:", 14002, 10, 100, 90, 10
+    AUTORADIOBUTTON "Följande användare:", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "Användarnamn:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "Lösenord:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Avbryt", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Avbryt", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc
index 910816daf69..b8f4bbe5e8a 100644
--- a/dll/win32/shell32/lang/tr-TR.rc
+++ b/dll/win32/shell32/lang/tr-TR.rc
@@ -358,23 +358,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Farklı Çalıştır"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Bu programı çalıştırmak için hangi kullanıcı hesabını kullanmak istiyorsunuz?", -1, 10, 20, 220, 20
-    CHECKBOX "Şi&mdiki Kullanıcı (%s)", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "Şi&mdiki Kullanıcı (%s)", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "&Bilgisayarımı ve verimi yetkilendirilmemiş program etkinliğinden koru", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "Bu seçenek, bilgisayar virüslerinin bilgisayarınıza ya da kişisel verilerinize zarar vermesini önleyebilir ancak onu seçmek programın düzgün çalışmamasına neden olabilir.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "Aşağıdaki kullanıcı:", 14002, 10, 100, 90, 10
+    AUTORADIOBUTTON "Aşağıdaki kullanıcı:", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "Kullanıcı adı:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "Parola:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "Tamam", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "İptal", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "Tamam", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "İptal", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc
index 09997ef3c96..dd59fc2c37d 100644
--- a/dll/win32/shell32/lang/uk-UA.rc
+++ b/dll/win32/shell32/lang/uk-UA.rc
@@ -356,23 +356,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Запуск від імені іншого користувача"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Чий обліковий запис використовувати для запуску цієї програми?", -1, 10, 20, 220, 20
-    CHECKBOX "Поточний користувач %s", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "Поточний користувач %s", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "Захистити мій комп'ютер і мої дані від несанкціонованої діяльності програм", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "Цей режим може захистити ваш комп'ютер і дані від вірусів, але програма може працювати неправильно.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "Указаний користувач:", 14002, 10, 100, 90, 10
+    AUTORADIOBUTTON "Указаний користувач:", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "Ім'я користувача:", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "Пароль:", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "Скасувати", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "OK", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "Скасувати", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc
index 24a81bf627b..8aa71de471e 100644
--- a/dll/win32/shell32/lang/zh-CN.rc
+++ b/dll/win32/shell32/lang/zh-CN.rc
@@ -366,23 +366,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "运行方式"
 FONT 9, "宋体", 0, 0, 0x0
 BEGIN
     LTEXT "您想使用哪个用户帐户运行这个程序？", -1, 10, 20, 220, 20
-    CHECKBOX "当前用户 %s", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "当前用户 %s", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "保护我的计算机和数据不受未授权程序的活动影响", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "这个选项可以保护您的计算机或个人数据不受病毒损害，但选择该选项可能会导致程序工作不正确。", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "下列用户：", 14002, 10, 100, 90, 10
+    AUTORADIOBUTTON "下列用户：", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "用户名：", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "密码：", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "确定", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "取消", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "确定", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "取消", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/zh-HK.rc b/dll/win32/shell32/lang/zh-HK.rc
index 80a753e83f4..848df5c9eaa 100644
--- a/dll/win32/shell32/lang/zh-HK.rc
+++ b/dll/win32/shell32/lang/zh-HK.rc
@@ -364,23 +364,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "執行身分"
 FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
     LTEXT "您要使用哪個使用者帳户來執行這個程式？", -1, 10, 20, 220, 20
-    CHECKBOX "目前的使用者為 %s", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "目前的使用者為 %s", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "保護我的電腦和數據不受未經授權程式的破壞", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "這個選項可以防止電腦病毒損害您的電腦或個人數據，但可能會導致程式無法正常執行。", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "以下使用者：", 14002, 10, 100, 90, 10
+    AUTORADIOBUTTON "以下使用者：", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "使用者名稱：", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "密碼：", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "確定", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "取消", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "確定", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "取消", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc
index 6f3f37c48eb..067d5b352d7 100644
--- a/dll/win32/shell32/lang/zh-TW.rc
+++ b/dll/win32/shell32/lang/zh-TW.rc
@@ -365,23 +365,22 @@ BEGIN
 END
 
 IDD_RUN_AS DIALOGEX 0, 0, 240, 190
-STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "執行身分"
 FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
     LTEXT "您要使用哪個使用者帳戶來執行這個程式？", -1, 10, 20, 220, 20
-    CHECKBOX "目前使用者為 %s", 14000, 10, 45, 150, 10
+    AUTORADIOBUTTON "目前使用者為 %s", IDC_RUNAS_THIS, 10, 45, 150, 10, WS_GROUP
     LTEXT "保護我的電腦和數據不受未經授權程式的破壞", -1, 25, 57, 200, 10, WS_DISABLED
     CHECKBOX "這個選項可以防止電腦病毒損害您的電腦或個人數據，但選擇它可能會導致程式無法正常執行。", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE
-    CHECKBOX "以下使用者：", 14002, 10, 100, 90, 10
+    AUTORADIOBUTTON "以下使用者：", IDC_RUNAS_OTHER, 10, 100, 90, 10
     LTEXT "使用者名稱：", -1, 20, 118, 54, 10
-    COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+    COMBOBOX IDC_RUNAS_NAME, 75, 115, 100, 15, CBS_DROPDOWN | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP
     LTEXT "密碼：", -1, 20, 143, 53, 10
-    EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
-    PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP
-    PUSHBUTTON "確定", 14007, 57, 170, 60, 14, WS_TABSTOP
-    PUSHBUTTON "取消", 14008, 122, 170, 60, 14, WS_TABSTOP
+    EDITTEXT IDC_RUNAS_PASS, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP
+    PUSHBUTTON "確定", IDOK, 57, 170, 60, 14, WS_TABSTOP
+    PUSHBUTTON "取消", IDCANCEL, 122, 170, 60, 14, WS_TABSTOP
 END
 
 IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190
diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp
index ce8113aefa9..57b70de4afe 100644
--- a/dll/win32/shell32/shlexec.cpp
+++ b/dll/win32/shell32/shlexec.cpp
@@ -458,6 +458,132 @@ static HRESULT SHELL_GetPathFromIDListForExecuteW(LPCITEMIDLIST pidl, LPWSTR psz
     return hr;
 }
 
+static HWND SHELL_GetUsableDialogOwner(HWND hwnd)
+{
+    // Explicitly block the shell desktop listview from becoming the owner (IContextMenu calling ShellExecute)
+    HWND progman = GetShellWindow();
+    if (hwnd && IsWindowVisible(hwnd) && hwnd != GetDesktopWindow() &&
+        hwnd != progman && !IsChild(progman, hwnd))
+    {
+        return hwnd;
+    }
+    return NULL;
+}
+
+/*************************************************************************
+ *    SHELL_PromptAndRunProcessAs [Internal]
+ */
+typedef struct {
+    WCHAR NameBuffer[MAX_PATH], Pass[MAX_PATH];
+    LPWSTR Name, Domain;
+    BOOL Safer;
+} RUNASDLGDATA;
+
+static INT_PTR CALLBACK RunAsDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    RUNASDLGDATA *pData = (RUNASDLGDATA *)GetWindowLongPtr(hwnd, DWLP_USER);
+    switch(uMsg)
+    {
+        case WM_INITDIALOG:
+            {
+                SetWindowLongPtr(hwnd, DWLP_USER, (LPARAM)(pData = (RUNASDLGDATA *)lParam));
+                SendDlgItemMessage(hwnd, IDC_RUNAS_NAME, EM_LIMITTEXT, _countof(RUNASDLGDATA::NameBuffer)-1, 0);
+                SendDlgItemMessage(hwnd, IDC_RUNAS_PASS, EM_LIMITTEXT, _countof(RUNASDLGDATA::Pass)-1, 0);
+                SendDlgItemMessage(hwnd, IDC_RUNAS_OTHER, BM_CLICK, 0, 0);
+
+                HWND control = GetDlgItem(hwnd, IDC_RUNAS_THIS);
+                WCHAR fmtbuf[200], buf[_countof(fmtbuf) + _countof(RUNASDLGDATA::NameBuffer)];
+                DWORD cch = _countof(RUNASDLGDATA::NameBuffer);
+                if (GetUserName(pData->NameBuffer, &cch))
+                {
+                    SendMessage(control, WM_GETTEXT, _countof(fmtbuf), (LPARAM)buf);
+                    wsprintfW(fmtbuf, buf, L"(%s)"); // Change "Blah blah %s" to "Blah blah (%s)"
+                    wsprintfW(buf, fmtbuf, pData->NameBuffer);
+                    SendMessage(control, WM_SETTEXT, 0, (LPARAM)buf);
+                    SendDlgItemMessage(hwnd, IDC_RUNAS_NAME, CB_ADDSTRING, 0, (LPARAM)pData->NameBuffer);
+                }
+                SendDlgItemMessage(hwnd, IDC_RUNAS_NAME, CB_SETCURSEL, 0, 0);
+                return TRUE;
+            }
+            break;
+        case WM_COMMAND:
+            switch(LOWORD(wParam))
+            {
+                case IDCANCEL:
+                    EndDialog(hwnd, 1);
+                    break;
+                case IDOK:
+                    {
+                        pData->Safer = SendDlgItemMessage(hwnd, IDC_RUNAS_SAFER,
+                                                          BM_GETCHECK, 0, 0);
+                        SendDlgItemMessage(hwnd, IDC_RUNAS_NAME, WM_GETTEXT,
+                                           _countof(RUNASDLGDATA::NameBuffer), (LPARAM)pData->NameBuffer);
+                        SendDlgItemMessage(hwnd, IDC_RUNAS_PASS, WM_GETTEXT,
+                                           _countof(RUNASDLGDATA::Pass), (LPARAM)pData->Pass);
+                        UINT other = SendDlgItemMessage(hwnd, IDC_RUNAS_OTHER,
+                                                        BM_GETCHECK, 0, 0) != 0;
+                        pData->Name = pData->NameBuffer;
+                        pData->Domain = strstrW(pData->Name, L"\\");
+                        if (pData->Domain)
+                        {
+                            LPWSTR tmp = pData->Domain + 1;
+                            pData->Domain[0] = UNICODE_NULL;
+                            pData->Domain = pData->Name;
+                            pData->Name = tmp;
+                        }
+                        if (other)
+                        {
+                            HANDLE token;
+                            if (!LogonUser(pData->Name, pData->Domain, pData->Pass,
+                                           LOGON32_LOGON_INTERACTIVE, LOGON32_PROVIDER_DEFAULT,
+                                           &token))
+                                return SHELL_ErrorBox(hwnd);
+                            CloseHandle(token);
+                            other |= (GetKeyState(VK_SHIFT) & 0x8000);
+                        }
+                        EndDialog(hwnd, 2 + other);
+                    }
+                    break;
+                case IDC_RUNAS_BROWSE:
+                    return SHELL_ErrorBox(hwnd, ERROR_CALL_NOT_IMPLEMENTED); // TODO
+            }
+            break;
+    }
+    return FALSE;
+}
+
+static HRESULT SHELL_PromptAndRunProcessAs(HWND hwnd, LPWSTR Cmd, DWORD CreationFlags,
+                                           LPWSTR Env, LPCWSTR Dir,
+                                           STARTUPINFOW *pSI, PROCESS_INFORMATION *pPI)
+{
+    RUNASDLGDATA data;
+    INT_PTR dlgret = DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCEW(IDD_RUN_AS),
+                                     SHELL_GetUsableDialogOwner(hwnd), RunAsDlgProc, (LPARAM)&data);
+    if (dlgret > 2)
+    {
+        UINT logonFlags = (dlgret & 0x8000) ? LOGON_NETCREDENTIALS_ONLY : LOGON_WITH_PROFILE;
+        dlgret = CreateProcessWithLogonW(data.Name, data.Domain, data.Pass, logonFlags,
+                                         NULL, Cmd, CreationFlags, Env, Dir, pSI, pPI);
+    }
+    else if (dlgret > 1)
+    {
+        // TODO: Use the Safer API if requested to
+        dlgret = CreateProcessW(NULL, Cmd, NULL, NULL, FALSE, CreationFlags, Env, Dir, pSI, pPI);
+    }
+    else if (dlgret > 0)
+    {
+        SetLastError(ERROR_CANCELLED);
+        return S_FALSE;
+    }
+    SecureZeroMemory(&data, sizeof(RUNASDLGDATA));
+    if (dlgret == 0 || dlgret == -1)
+    {
+        pPI->hProcess = NULL;
+        return E_FAIL;
+    }
+    return S_OK;
+}
+
 /*************************************************************************
  *    SHELL_ExecuteW [Internal]
  *
@@ -468,7 +594,7 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait,
     STARTUPINFOW  startup;
     PROCESS_INFORMATION info;
     UINT_PTR retval = SE_ERR_NOASSOC;
-    UINT gcdret = 0;
+    UINT gcdret = 0, gle;
     WCHAR curdir[MAX_PATH];
     DWORD dwCreationFlags;
     const WCHAR *lpDirectory = NULL;
@@ -503,8 +629,25 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait,
     if (psei->fMask & SEE_MASK_HASLINKNAME)
         startup.dwFlags |= STARTF_TITLEISLINKNAME;
 
-    if (CreateProcessW(NULL, (LPWSTR)lpCmd, NULL, NULL, FALSE, dwCreationFlags, env,
-                       lpDirectory, &startup, &info))
+    BOOL createdProcess;
+    if (psei->lpVerb && !StrCmpI(L"runas", psei->lpVerb))
+    {
+        HRESULT hr = SHELL_PromptAndRunProcessAs(psei->hwnd, (LPWSTR)lpCmd, dwCreationFlags,
+                                                 env, lpDirectory, &startup, &info);
+        createdProcess = hr == S_OK;
+        if (hr == S_FALSE)
+        {
+            retval = 33; // Pretend cancel is success.
+            goto done;
+        }
+    }
+    else
+    {
+        createdProcess = CreateProcessW(NULL, (LPWSTR)lpCmd, NULL, NULL, FALSE,
+                                        dwCreationFlags, env, lpDirectory, &startup, &info);
+    }
+
+    if (createdProcess)
     {
         /* Give 30 seconds to the app to come up, if desired. Probably only needed
            when starting app immediately before making a DDE connection. */
@@ -519,20 +662,22 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait,
             CloseHandle( info.hProcess );
         CloseHandle( info.hThread );
     }
-    else if ((retval = GetLastError()) >= 32)
+    else if ((retval = gle = GetLastError()) >= 32)
     {
         WARN("CreateProcess returned error %ld\n", retval);
         retval = ERROR_BAD_FORMAT;
     }
 
+done:
     TRACE("returning %lu\n", retval);
-
     psei_out->hInstApp = (HINSTANCE)retval;
 
     if (gcdret)
+    {
         if (!SetCurrentDirectoryW(curdir))
             ERR("cannot return to directory %s\n", debugstr_w(curdir));
-
+        RestoreLastError(gle);
+    }
     return retval;
 }
 
diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h
index edaa5ab9e57..b167a9c448f 100644
--- a/dll/win32/shell32/shresdef.h
+++ b/dll/win32/shell32/shresdef.h
@@ -351,6 +351,15 @@
 #define IDC_RUNDLG_EDITPATH    12298
 #define IDC_RUNDLG_LABEL       12305
 
+/* Run As dialog */
+#define IDD_RUN_AS 23
+#define IDC_RUNAS_THIS   100
+#define IDC_RUNAS_OTHER  101
+#define IDC_RUNAS_SAFER  102
+#define IDC_RUNAS_NAME   103
+#define IDC_RUNAS_BROWSE 104
+#define IDC_RUNAS_PASS   105
+
 /* ShellAbout dialog */
 #define IDD_ABOUT                     2
 #define IDC_ABOUT_ICON                0x3009
@@ -499,7 +508,6 @@
 #define IDC_LOG_OFF_TEXT_STATIC             15005
 
 /* Other dialogs */
-#define IDD_RUN_AS       23
 #define IDD_OPEN_WITH    24
 #define IDD_FORMAT_DRIVE 25
 #define IDD_CHECK_DISK   26
diff --git a/sdk/include/reactos/shellutils.h b/sdk/include/reactos/shellutils.h
index 9ccce4d3373..30067691787 100644
--- a/sdk/include/reactos/shellutils.h
+++ b/sdk/include/reactos/shellutils.h
@@ -88,6 +88,42 @@ inline BOOL _ROS_FAILED_HELPER(HRESULT hr, const char* expr, const char* filenam
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
 
+static inline UINT
+SHELL_ErrorBoxHelper(HWND hwndOwner, UINT Error)
+{
+    WCHAR buf[400];
+    UINT cch, msgId, u32_errstr = 2;
+
+    if (!IsWindowVisible(hwndOwner))
+        hwndOwner = NULL;
+    if (Error == ERROR_SUCCESS)
+        Error = ERROR_INTERNAL_ERROR;
+
+    msgId = Error;
+retry:
+    cch = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+                         NULL, msgId, 0, buf, _countof(buf), NULL);
+    if (!cch)
+    {
+        if (HIWORD(msgId) == HIWORD(HRESULT_FROM_WIN32(1)))
+        {
+            msgId = LOWORD(msgId);
+            goto retry;
+        }
+        cch = LoadStringW(LoadLibrary(TEXT("USER32")), u32_errstr, buf, _countof(buf));
+        wsprintfW(buf + cch, L"\n\n%#x (%d)", Error, Error);
+    }
+    MessageBoxW(hwndOwner, buf, NULL, MB_OK | MB_ICONSTOP);
+    return Error;
+}
+#ifdef __cplusplus
+template<class H> static UINT
+SHELL_ErrorBox(H hwndOwner, UINT Error = GetLastError())
+{
+    return SHELL_ErrorBoxHelper(hwndOwner, Error);
+}
+#endif
+
 #ifdef __cplusplus
 template <typename T>
 class CComCreatorCentralInstance