diff --git a/dll/win32/netid/lang/bg-BG.rc b/dll/win32/netid/lang/bg-BG.rc
index 3c4bf1c6a19..e1f7a6d47fb 100644
--- a/dll/win32/netid/lang/bg-BG.rc
+++ b/dll/win32/netid/lang/bg-BG.rc
@@ -17,7 +17,9 @@ BEGIN
     PUSHBUTTON "&Мрежов опознавател...", IDC_NETWORK_ID, 170, 114, 85, 15
     LTEXT "За преименуване на компютъра или присъединяване към имение, натиснете „Промяна”.", IDC_STATIC, 6, 149, 170, 24
     PUSHBUTTON "Про&мяна...", IDC_NETWORK_PROPERTY, 170, 149, 85, 15
-    LTEXT "Забележка: Само управниците могат да променят опознавателите\n на компютъра.", IDC_STATIC, 6, 179, 300, 18
+    LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
+    ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
+    LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
 END
 
 IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
diff --git a/dll/win32/netid/lang/cs-CZ.rc b/dll/win32/netid/lang/cs-CZ.rc
index 714f62b8583..a6760baedbd 100644
--- a/dll/win32/netid/lang/cs-CZ.rc
+++ b/dll/win32/netid/lang/cs-CZ.rc
@@ -22,7 +22,9 @@ BEGIN
     PUSHBUTTON "&Síťová ID...", IDC_NETWORK_ID, 190, 114, 58, 15 //FIXME nic vic nez "sitova ID" se nevejde na tlacitko!
     LTEXT "Kliknutím na ""Změnit"" lze přejmenovat tento počítač nebo se připojit k doméně.", IDC_STATIC, 6, 149, 170, 17
     PUSHBUTTON "&Změnit...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15
-    LTEXT "Poznámka: Identifikaci tohoto počítače mohou změnit pouze administrátoři.", IDC_STATIC, 6, 179, 300, 9
+    LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
+    ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
+    LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
 END
 
 IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
diff --git a/dll/win32/netid/lang/de-DE.rc b/dll/win32/netid/lang/de-DE.rc
index b746ded95f2..100dc5b3ae8 100644
--- a/dll/win32/netid/lang/de-DE.rc
+++ b/dll/win32/netid/lang/de-DE.rc
@@ -13,7 +13,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Computername"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON
+    ICON IDI_COMPNAME, IDC_STATIC, 7, 7, 20, 20, SS_ICON
     LTEXT "ReactOS benutzt folgende Informationen, um Ihren Computer im Netzwerk zu identifizieren.", IDC_STATIC, 40, 5, 204, 20
     LTEXT "Computerbeschreibung:", IDC_STATIC, 6, 40, 80, 9
     EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
@@ -25,7 +25,9 @@ BEGIN
     PUSHBUTTON "&Netzwerk-ID...", IDC_NETWORK_ID, 190, 114, 58, 15
     LTEXT "Um diesen Computer umzubenennen oder sich an einer Domäne anzumelden, klicken Sie auf ""Ändern"".", IDC_STATIC, 6, 149, 170, 17
     PUSHBUTTON "&Ändern...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15
-    LTEXT "Bitte beachten: Nur Administratoren können die Identifikation dieses Computers ändern.", IDC_STATIC, 6, 179, 250, 18
+    LTEXT "", IDC_MESSAGETEXT, 7, 172, 242, 24
+    ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON
+    LTEXT "Änderungen werden beim nächsten Neustart des Computers übernommen.", IDC_RESTARTTEXT, 25, 195, 209, 8
 END
 
 IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
diff --git a/dll/win32/netid/lang/el-GR.rc b/dll/win32/netid/lang/el-GR.rc
index 564cc0093fa..f07da89eaf6 100644
--- a/dll/win32/netid/lang/el-GR.rc
+++ b/dll/win32/netid/lang/el-GR.rc
@@ -17,7 +17,9 @@ BEGIN
     PUSHBUTTON "&Network ID...", IDC_NETWORK_ID, 190, 114, 58, 15
     LTEXT "Για να μετονομάσετε αυτόν τον υπολογιστή ή να συμμετάσχετε σε μια ομάδα εργασίας, κάντε κλικ στο κουμπί ""Αλλαγή"".", IDC_STATIC, 6, 149, 170, 17
     PUSHBUTTON "&Αλλαγή...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15
-    LTEXT "Σημείωση: Μόνο οι διαχειριστές συστήματος μπορούν να αλλάξουν το αναγνωριστικό αυτού του υπολογιστή.", IDC_STATIC, 6, 179, 300, 9
+    LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
+    ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
+    LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
 END
 
 IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
@@ -72,7 +74,7 @@ BEGIN
     23 "Welcome to the %1 domain."
     24 "You must restart this computer for the changes to take effect."
     25 "You can change the name and the membership of this computer. Changes may affect access to network resources."
-    1021 "Note: Only Administrators can change the identification of this computer."
+    1021 "Σημείωση: Μόνο οι διαχειριστές συστήματος μπορούν να αλλάξουν το αναγνωριστικό αυτού του υπολογιστή."
     1022 "Note: The identification of the computer cannot be changed because:"
     1029 "The new computer name ""%1"" is a number. The name may not be a number."
     1030 "The new computer name ""%1"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / and ?"
diff --git a/dll/win32/netid/lang/en-US.rc b/dll/win32/netid/lang/en-US.rc
index 0dd535d3dd5..e8c98078e69 100644
--- a/dll/win32/netid/lang/en-US.rc
+++ b/dll/win32/netid/lang/en-US.rc
@@ -17,7 +17,9 @@ BEGIN
     PUSHBUTTON "&Network ID...", IDC_NETWORK_ID, 190, 114, 58, 15
     LTEXT "To rename this computer or join a domain, click ""Change"".", IDC_STATIC, 6, 149, 170, 17
     PUSHBUTTON "&Change...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15
-    LTEXT "Note: Only Administrators can change the identification of this computer.", IDC_STATIC, 6, 179, 300, 9
+    LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
+    ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
+    LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
 END
 
 IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
diff --git a/dll/win32/netid/lang/es-ES.rc b/dll/win32/netid/lang/es-ES.rc
index 16361d40802..77e32ba03f1 100644
--- a/dll/win32/netid/lang/es-ES.rc
+++ b/dll/win32/netid/lang/es-ES.rc
@@ -19,7 +19,9 @@ BEGIN
     PUSHBUTTON "&Id de red...", IDC_NETWORK_ID, 190, 114, 58, 15
     LTEXT "Para cambiar el nombre de este equipo o unirse a un dominio, haga clic en ""Cambiar"".", IDC_STATIC, 6, 149, 170, 17
     PUSHBUTTON "Cam&biar...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15
-    LTEXT "Nota: Sólo los Administradores pueden cambiar la identificación de este equipo.", IDC_STATIC, 6, 179, 250, 17
+    LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
+    ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
+    LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
 END
 
 IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
diff --git a/dll/win32/netid/lang/fr-FR.rc b/dll/win32/netid/lang/fr-FR.rc
index 8f619c286ae..c15db5a7dae 100644
--- a/dll/win32/netid/lang/fr-FR.rc
+++ b/dll/win32/netid/lang/fr-FR.rc
@@ -17,7 +17,9 @@ BEGIN
     PUSHBUTTON "ID &réseau...", IDC_NETWORK_ID, 170, 114, 78, 15
     LTEXT "Pour changer le nom de cet ordinateur ou rejoindre un domaine, cliquez sur Modifier.", IDC_STATIC, 6, 149, 160, 17
     PUSHBUTTON "Modifier...", IDC_NETWORK_PROPERTY, 170, 149, 78, 15
-    LTEXT "Note : Seuls les administrateurs peuvent modifier l'identification de cet ordinateur.", IDC_STATIC, 6, 179, 244, 18
+    LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
+    ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
+    LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
 END
 
 IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
diff --git a/dll/win32/netid/lang/he-IL.rc b/dll/win32/netid/lang/he-IL.rc
index 2ec81df9dd2..d7f3c9ea7f8 100644
--- a/dll/win32/netid/lang/he-IL.rc
+++ b/dll/win32/netid/lang/he-IL.rc
@@ -17,7 +17,9 @@ BEGIN
     PUSHBUTTON "מזהה רשת...", IDC_NETWORK_ID, 190, 114, 58, 15
     LTEXT "To rename this computer or join a domain, click ""Change"".", IDC_STATIC, 6, 149, 170, 17
     PUSHBUTTON "שנה...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15
-    LTEXT "Note: Only Administrators can change the identification of this computer.", IDC_STATIC, 6, 179, 300, 9
+    LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
+    ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
+    LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
 END
 
 IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
diff --git a/dll/win32/netid/lang/id-ID.rc b/dll/win32/netid/lang/id-ID.rc
index 446fe427115..f6b78ce4aa6 100644
--- a/dll/win32/netid/lang/id-ID.rc
+++ b/dll/win32/netid/lang/id-ID.rc
@@ -17,7 +17,9 @@ BEGIN
     PUSHBUTTON "&Network ID...", IDC_NETWORK_ID, 190, 114, 58, 15
     LTEXT "Untuk mengganti nama komputer ini atau bergabung dengan domain, klik ""Ubah"".", IDC_STATIC, 6, 149, 170, 17
     PUSHBUTTON "&Ubah...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15
-    LTEXT "Catatan: Hanya Administrator yang bisa mengubah identifikasi komputer ini.", IDC_STATIC, 6, 179, 300, 9
+    LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
+    ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
+    LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
 END
 
 IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
@@ -72,7 +74,7 @@ BEGIN
     23 "Welcome to the %1 domain."
     24 "You must restart this computer for the changes to take effect."
     25 "You can change the name and the membership of this computer. Changes may affect access to network resources."
-    1021 "Note: Only Administrators can change the identification of this computer."
+    1021 "Catatan: Hanya Administrator yang bisa mengubah identifikasi komputer ini."
     1022 "Note: The identification of the computer cannot be changed because:"
     1029 "The new computer name ""%1"" is a number. The name may not be a number."
     1030 "The new computer name ""%1"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / and ?"
diff --git a/dll/win32/netid/lang/it-IT.rc b/dll/win32/netid/lang/it-IT.rc
index 568a105fa39..645d092ad8b 100644
--- a/dll/win32/netid/lang/it-IT.rc
+++ b/dll/win32/netid/lang/it-IT.rc
@@ -19,7 +19,9 @@ BEGIN
     PUSHBUTTON "&ID di rete...", IDC_NETWORK_ID, 190, 114, 58, 15
     LTEXT "Per cambiare il nome a questo computer o collegarsi a un dominio, clicca ""Modifica"".", IDC_STATIC, 6, 149, 170, 17
     PUSHBUTTON "&Modifica...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15
-    LTEXT "Nota: Solo gli amministratori possono cambiare il nome di questo computer.", IDC_STATIC, 6, 179, 300, 9
+    LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
+    ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
+    LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
 END
 
 IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
diff --git a/dll/win32/netid/lang/ja-JP.rc b/dll/win32/netid/lang/ja-JP.rc
index f1c1cc94f75..6f25136a811 100644
--- a/dll/win32/netid/lang/ja-JP.rc
+++ b/dll/win32/netid/lang/ja-JP.rc
@@ -17,7 +17,9 @@ BEGIN
     PUSHBUTTON "ネットワーク ID(&N)...", IDC_NETWORK_ID, 180, 114, 72, 15
     LTEXT "コンピュータ名を変更したりドメインに参加したりするには [変更] をクリックしてください。", IDC_STATIC, 6, 149, 170, 17
     PUSHBUTTON "変更(&C)...", IDC_NETWORK_PROPERTY, 180, 149, 72, 15
-    LTEXT "注意: このコンピュータの ID を変更できるのは管理者のみです。", IDC_STATIC, 6, 179, 300, 9
+    LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
+    ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
+    LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
 END
 
 IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
diff --git a/dll/win32/netid/lang/nl-NL.rc b/dll/win32/netid/lang/nl-NL.rc
index 92427acd5cd..a9ff78a6d3b 100644
--- a/dll/win32/netid/lang/nl-NL.rc
+++ b/dll/win32/netid/lang/nl-NL.rc
@@ -17,7 +17,9 @@ BEGIN
     PUSHBUTTON "&Netwerk ID...", IDC_NETWORK_ID, 190, 114, 58, 15
     LTEXT "Om deze computer te hernoemen of om lid te worden van een domein, klik op ""Change"".", IDC_STATIC, 6, 149, 170, 17
     PUSHBUTTON "&Wijzigen...",IDC_NETWORK_PROPERTY, 190, 149, 58, 15
-    LTEXT "Let op: Alleen Administrators mogen de indentificatie van deze computer aanpassen.", IDC_STATIC, 6, 179, 300, 9
+    LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
+    ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
+    LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
 END
 
 IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
diff --git a/dll/win32/netid/lang/no-NO.rc b/dll/win32/netid/lang/no-NO.rc
index 93685752283..e354e769573 100644
--- a/dll/win32/netid/lang/no-NO.rc
+++ b/dll/win32/netid/lang/no-NO.rc
@@ -17,7 +17,9 @@ BEGIN
     PUSHBUTTON "&Nettverk-ID...", IDC_NETWORK_ID, 190, 114, 58, 15
     LTEXT "Klikk Endre for å gi datamaskinen et nytt navn eller bli med i et domenet.", IDC_STATIC, 6, 149, 170, 17
     PUSHBUTTON "&Endre...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15
-    LTEXT "OBS: Bare Administratorer kan endre disse innstillingene på datamaskinen.", IDC_STATIC, 6, 179, 300, 9
+    LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
+    ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
+    LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
 END
 
 IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
diff --git a/dll/win32/netid/lang/pl-PL.rc b/dll/win32/netid/lang/pl-PL.rc
index 22f412b1d39..f190c528bc1 100644
--- a/dll/win32/netid/lang/pl-PL.rc
+++ b/dll/win32/netid/lang/pl-PL.rc
@@ -26,7 +26,9 @@ BEGIN
     PUSHBUTTON "&Identyfikator sieciowy...", IDC_NETWORK_ID, 167, 100, 82, 14
     LTEXT "Aby zmienić nazwę tego komputera lub przyłączyć się do grupy roboczej, kliknij przycisk Zmień.", IDC_STATIC, 7, 149, 153, 26
     PUSHBUTTON "Z&mień...", IDC_NETWORK_PROPERTY, 167, 149, 82, 14
-    LTEXT "Uwaga: Tylko administratorzy mogą zmienić identyfikator tego komputera.", IDC_STATIC, 6, 182, 300, 9
+    LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
+    ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
+    LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
 END
 
 IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
diff --git a/dll/win32/netid/lang/pt-PT.rc b/dll/win32/netid/lang/pt-PT.rc
index c42c506c265..66a1f1f99a4 100644
--- a/dll/win32/netid/lang/pt-PT.rc
+++ b/dll/win32/netid/lang/pt-PT.rc
@@ -22,7 +22,9 @@ BEGIN
     PUSHBUTTON "&ID de rede", IDC_NETWORK_ID, 190, 114, 58, 15
     LTEXT "Para alterar o nome a este computador ou escolher um domínio, clique em ""Alterar"".", IDC_STATIC, 6, 149, 170, 17
     PUSHBUTTON "&Alterar...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15
-    LTEXT "Nota: Somente administradores podem alterar a identificação deste computador.", IDC_STATIC, 2, 179, 200, 20
+    LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
+    ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
+    LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
 END
 
 IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
diff --git a/dll/win32/netid/lang/ro-RO.rc b/dll/win32/netid/lang/ro-RO.rc
index 2ba7e8e124a..ceea6a1a621 100644
--- a/dll/win32/netid/lang/ro-RO.rc
+++ b/dll/win32/netid/lang/ro-RO.rc
@@ -23,7 +23,9 @@ BEGIN
     PUSHBUTTON  "I&D de rețea…", IDC_NETWORK_ID, 190, 114, 58, 15
     LTEXT "Pentru a schimba identitatea calculatorului sau a intra într-un domeniu, apăsați „Schimbare”.", IDC_STATIC, 6, 149, 170, 17
     PUSHBUTTON  "S&chimbare…", IDC_NETWORK_PROPERTY, 190, 149, 58, 15
-    LTEXT "Notă: Doar administratorii pot schimba identitatea calculatorului.", IDC_STATIC, 6, 179, 300, 9
+    LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
+    ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
+    LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
 END
 
 IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
diff --git a/dll/win32/netid/lang/ru-RU.rc b/dll/win32/netid/lang/ru-RU.rc
index 4ad76873ff0..ec060e453cc 100644
--- a/dll/win32/netid/lang/ru-RU.rc
+++ b/dll/win32/netid/lang/ru-RU.rc
@@ -17,7 +17,9 @@ BEGIN
     PUSHBUTTON "&Идентификация...", IDC_NETWORK_ID, 180, 114, 72, 15
     LTEXT "Чтобы изменить имя компьютера или домена нажмите ""Изменить"".", IDC_STATIC, 6, 149, 170, 17
     PUSHBUTTON "И&зменить...", IDC_NETWORK_PROPERTY, 180, 149, 72, 15
-    LTEXT "Примечание: Только администраторы могут изменять эти параметры.", IDC_STATIC, 6, 179, 245, 9
+    LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
+    ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
+    LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
 END
 
 IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
diff --git a/dll/win32/netid/lang/sk-SK.rc b/dll/win32/netid/lang/sk-SK.rc
index e2e963ccd32..f712c4182a5 100644
--- a/dll/win32/netid/lang/sk-SK.rc
+++ b/dll/win32/netid/lang/sk-SK.rc
@@ -24,7 +24,9 @@ BEGIN
     PUSHBUTTON "&Sieťová identifikácia", IDC_NETWORK_ID, 176, 114, 72, 15
     LTEXT "Ak chcete zmeniť názov počítača alebo sa pripojiť na doménu, kliknite na tlačidlo Zmeniť.", IDC_STATIC, 6, 149, 160, 17
     PUSHBUTTON "Z&meniť...", IDC_NETWORK_PROPERTY, 176, 149, 72, 15
-    LTEXT "Poznámka: Identifikáciu počítača môžu zmeniť len správcovia počítača.", IDC_STATIC, 6, 179, 244, 9
+    LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
+    ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
+    LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
 END
 
 IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
diff --git a/dll/win32/netid/lang/sq-AL.rc b/dll/win32/netid/lang/sq-AL.rc
index bb839c8d448..ba5abc45348 100644
--- a/dll/win32/netid/lang/sq-AL.rc
+++ b/dll/win32/netid/lang/sq-AL.rc
@@ -21,7 +21,9 @@ BEGIN
     PUSHBUTTON "&ID Rrjetit...", IDC_NETWORK_ID, 190, 114, 58, 15
     LTEXT "Për të riemërtuar këtë kompjuter apo të bashkohet me një domain, klikoni ""Ndrysho"".", IDC_STATIC, 6, 149, 170, 17
     PUSHBUTTON "&Ndrysho...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15
-    LTEXT "Shënim: Vetëm Administratorët mund të ndryshojnë identifikimin e këtij kompjuteri.", IDC_STATIC, 6, 179, 300, 9
+    LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
+    ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
+    LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
 END
 
 IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
diff --git a/dll/win32/netid/lang/tr-TR.rc b/dll/win32/netid/lang/tr-TR.rc
index 1a8cc14017c..55df38a5c87 100644
--- a/dll/win32/netid/lang/tr-TR.rc
+++ b/dll/win32/netid/lang/tr-TR.rc
@@ -19,7 +19,9 @@ BEGIN
     PUSHBUTTON "&Ağ Kimliği...", IDC_NETWORK_ID, 190, 114, 58, 15
     LTEXT "Bu bilgisayarı yeniden adlandırmak veyâ bir etki alanına katılmak için ""Değiştir""e tıklayınız.", IDC_STATIC, 6, 149, 170, 17
     PUSHBUTTON "&Değştir...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15
-    LTEXT "Önemli: Bu bilgisayarın kimliğini yalnızca yöneticiler değiştirebilir.", IDC_STATIC, 6, 179, 300, 9
+    LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
+    ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
+    LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
 END
 
 IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
diff --git a/dll/win32/netid/lang/uk-UA.rc b/dll/win32/netid/lang/uk-UA.rc
index 0b7d0bc7ff5..c87ee976003 100644
--- a/dll/win32/netid/lang/uk-UA.rc
+++ b/dll/win32/netid/lang/uk-UA.rc
@@ -25,7 +25,9 @@ BEGIN
     PUSHBUTTON "Іденти&фікація...", IDC_NETWORK_ID, 190, 114, 60, 15
     LTEXT "Щоб перейменувати цей комп'ютер або приєднати його до домену, натисніть кнопку ""Змінити"".", IDC_STATIC, 6, 149, 170, 17
     PUSHBUTTON "&Змінити...", IDC_NETWORK_PROPERTY, 190, 149, 60, 15
-    LTEXT "Примітка: змінити ідентифікацію цього комп'ютера можуть лише адміністратори.", IDC_STATIC, 6, 179, 230, 18
+    LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
+    ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
+    LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
 END
 
 IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
diff --git a/dll/win32/netid/lang/zh-CN.rc b/dll/win32/netid/lang/zh-CN.rc
index 3259168559a..2e8bb49202e 100644
--- a/dll/win32/netid/lang/zh-CN.rc
+++ b/dll/win32/netid/lang/zh-CN.rc
@@ -20,7 +20,9 @@ BEGIN
     PUSHBUTTON "网络 ID...(&N)", IDC_NETWORK_ID, 190, 114, 58, 15
     LTEXT "若要重命名此计算机或加入域，请单击""更改""。", IDC_STATIC, 6, 149, 170, 17
     PUSHBUTTON "更改...(&C)", IDC_NETWORK_PROPERTY, 190, 149, 58, 15
-    LTEXT "注意: 只有管理员才可以更改此计算机的标识。", IDC_STATIC, 6, 179, 300, 9
+    LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
+    ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
+    LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
 END
 
 IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
diff --git a/dll/win32/netid/lang/zh-TW.rc b/dll/win32/netid/lang/zh-TW.rc
index 32039757e2e..4991450f8e2 100644
--- a/dll/win32/netid/lang/zh-TW.rc
+++ b/dll/win32/netid/lang/zh-TW.rc
@@ -20,7 +20,9 @@ BEGIN
     PUSHBUTTON "網路 ID...(&N)", IDC_NETWORK_ID, 190, 114, 58, 15
     LTEXT "若要重新命名此電腦或加入域，請點選 [更改]。", IDC_STATIC, 6, 149, 170, 17
     PUSHBUTTON "更改...(&C)", IDC_NETWORK_PROPERTY, 190, 149, 58, 15
-    LTEXT "注意: 只有管理員才可以更改此電腦的標識。", IDC_STATIC, 6, 179, 300, 9
+    LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
+    ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
+    LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
 END
 
 IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
diff --git a/dll/win32/netid/netid.c b/dll/win32/netid/netid.c
index 10f92fcad80..c7387831712 100644
--- a/dll/win32/netid/netid.c
+++ b/dll/win32/netid/netid.c
@@ -28,10 +28,16 @@
 typedef struct _NETIDDATA
 {
     WCHAR szHostName[MAX_HOSTNAME_LENGTH + 1];
+    WCHAR szOldHostName[MAX_HOSTNAME_LENGTH + 1];
     WCHAR szDomainName[MAX_DOMAINNAME_LENGTH + 1];
+    WCHAR szOldDomainName[MAX_DOMAINNAME_LENGTH + 1];
     WCHAR szComputerName[MAX_COMPUTERNAME_LENGTH + 1];
+    BOOL bSyncDomainWithMembership;
+    LPWSTR JoinName;
+    NETSETUP_JOIN_STATUS JoinStatus;
     BOOL bHostNameChanged;
     BOOL bDomainNameChanged;
+    BOOL bSyncDomainWithMembershipChanged;
     BOOL bEnable;
 } NETIDDATA, *PNETIDDATA;
 
@@ -90,6 +96,14 @@ GetComputerNames(
                          (LPBYTE)&pNetIdData->szHostName,
                          &dwSize);
 
+        dwSize = sizeof(pNetIdData->szOldHostName);
+        RegQueryValueExW(KeyHandle,
+                         L"HostName",
+                         0,
+                         NULL,
+                         (LPBYTE)&pNetIdData->szOldHostName,
+                         &dwSize);
+
         dwSize = sizeof(pNetIdData->szDomainName);
         RegQueryValueExW(KeyHandle,
                          L"NV Domain",
@@ -98,6 +112,23 @@ GetComputerNames(
                          (LPBYTE)&pNetIdData->szDomainName,
                          &dwSize);
 
+        dwSize = sizeof(pNetIdData->szOldDomainName);
+        RegQueryValueExW(KeyHandle,
+                         L"Domain",
+                         0,
+                         NULL,
+                         (LPBYTE)&pNetIdData->szOldDomainName,
+                         &dwSize);
+
+        dwSize = sizeof(pNetIdData->bSyncDomainWithMembership);
+        if (RegQueryValueExW(KeyHandle,
+                             L"SyncDomainWithMembership",
+                             0,
+                             NULL,
+                             (LPBYTE)&pNetIdData->bSyncDomainWithMembership,
+                             &dwSize))
+            pNetIdData->bSyncDomainWithMembership = TRUE;
+
         RegCloseKey(KeyHandle);
     }
 
@@ -119,6 +150,12 @@ GetComputerNames(
         RegCloseKey(KeyHandle);
     }
 
+    if (NetGetJoinInformation(NULL, &pNetIdData->JoinName, &pNetIdData->JoinStatus) != NERR_Success)
+    {
+        pNetIdData->JoinName = NULL;
+        pNetIdData->JoinStatus = NetSetupUnknownStatus;
+    }
+
     return TRUE;
 }
 
@@ -180,7 +217,7 @@ DNSSuffixPropDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
                 SetWindowLongPtr(hDlg, DWLP_USER, (LONG_PTR)pNetIdData);
 
                 SetDlgItemTextW(hDlg, 1011, pNetIdData->szDomainName);
-
+                SendDlgItemMessage(hDlg, 115, BM_SETCHECK, (WPARAM)pNetIdData->bSyncDomainWithMembership, 0);
                 SetDlgItemTextW(hDlg, 1013, pNetIdData->szComputerName);
                 EnableWindow(GetDlgItem(hDlg, IDOK), FALSE);
             }
@@ -189,10 +226,19 @@ DNSSuffixPropDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
         case WM_COMMAND:
             switch (LOWORD(wParam))
             {
+                case 115:
+                    if (HIWORD(wParam) == BN_CLICKED)
+                    {
+                        EnableWindow(GetDlgItem(hDlg, IDOK), TRUE);
+                        pNetIdData->bSyncDomainWithMembershipChanged = TRUE;
+                    }
+                    break;
+
                 case 1011:
                     if (HIWORD(wParam) == EN_CHANGE)
                     {
                         EnableWindow(GetDlgItem(hDlg, IDOK), TRUE);
+                        pNetIdData->bDomainNameChanged = TRUE;
                     }
                     break;
 
@@ -203,12 +249,23 @@ DNSSuffixPropDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
                         break;
                     }
 
-                    GetDlgItemTextW(hDlg, 1011, pNetIdData->szDomainName, ARRAYSIZE(pNetIdData->szDomainName));
-                    pNetIdData->bDomainNameChanged = TRUE;
+                    if (pNetIdData->bDomainNameChanged)
+                        GetDlgItemTextW(hDlg, 1011, pNetIdData->szDomainName, ARRAYSIZE(pNetIdData->szDomainName));
+
+                    if (pNetIdData->bSyncDomainWithMembershipChanged)
+                    {
+                        if (SendDlgItemMessage(hDlg, 115, BM_GETCHECK, 0, 0) == BST_CHECKED)
+                            pNetIdData->bSyncDomainWithMembership = TRUE;
+                        else
+                            pNetIdData->bSyncDomainWithMembership = FALSE;
+                    }
+
                     EndDialog(hDlg, TRUE);
                     break;
 
                 case IDCANCEL:
+                    pNetIdData->bDomainNameChanged = FALSE;
+                    pNetIdData->bSyncDomainWithMembershipChanged = FALSE;
                     EndDialog(hDlg, FALSE);
                     break;
             }
@@ -227,6 +284,7 @@ SetRadioBtnState(HWND hDlg, BOOL IsDomain)
     EnableWindow(GetDlgItem(hDlg, 1007), !IsDomain);
 }
 
+#if 0
 static VOID
 DisableControls(HWND hDlg)
 {
@@ -235,6 +293,7 @@ DisableControls(HWND hDlg)
     EnableWindow(GetDlgItem(hDlg, 116), FALSE);
     EnableWindow(GetDlgItem(hDlg, 1007), FALSE);
 }
+#endif
 
 static
 BOOL
@@ -323,16 +382,31 @@ UpdateNetbiosName(
                                &dwSize);
 }
 
+static
+VOID
+CheckForChangedNames(
+    _In_ HWND hwndDlg,
+    _In_ PNETIDDATA pNetIdData)
+{
+    INT nShow = SW_HIDE;
+
+    if ((wcsicmp(pNetIdData->szOldHostName, pNetIdData->szHostName) != 0) ||
+        (wcsicmp(pNetIdData->szOldDomainName, pNetIdData->szDomainName) != 0))
+    {
+        nShow = SW_SHOW;
+    }
+
+    ShowWindow(GetDlgItem(hwndDlg, IDC_RESTARTICON), nShow);
+    ShowWindow(GetDlgItem(hwndDlg, IDC_RESTARTTEXT), nShow);
+}
+
 static
 VOID
 NetworkDlg_OnInitDialog(
     HWND hDlg,
     PNETIDDATA pNetIdData)
 {
-    LPWKSTA_INFO_101 wki = NULL;
     WCHAR MsgText[MAX_PATH * 2];
-    LPWSTR JoinName = NULL;
-    NETSETUP_JOIN_STATUS JoinStatus;
 
     if (LoadStringW(hDllInstance, 25, MsgText, ARRAYSIZE(MsgText)))
         SetDlgItemText(hDlg, 1017, MsgText);
@@ -341,67 +415,21 @@ NetworkDlg_OnInitDialog(
     SetDlgItemText(hDlg, 1002, pNetIdData->szHostName);
     SetFullComputerName(hDlg, 1001, pNetIdData);
 
-    if (NetGetJoinInformation(NULL, &JoinName, &JoinStatus) != NERR_Success)
+    /* Display the workgroup or domain name */
+    switch (pNetIdData->JoinStatus)
     {
-        SetRadioBtnState(hDlg, FALSE);
+        case NetSetupDomainName:
+            SetDlgItemText(hDlg, 116, pNetIdData->JoinName);
+            SetRadioBtnState(hDlg, TRUE);
+            break;
 
-        if (NetWkstaGetInfo(NULL,
-                            101,
-                            (LPBYTE*)&wki) == NERR_Success)
-        {
-            SetDlgItemText(hDlg,
-                           1007,
-                           wki->wki101_langroup);
-        }
-        else
-        {
-            DisableControls(hDlg);
-        }
+        case NetSetupWorkgroupName:
+            SetDlgItemText(hDlg, 1007, pNetIdData->JoinName);
+            SetRadioBtnState(hDlg, FALSE);
+            break;
 
-        if (wki)
-            NetApiBufferFree(wki);
-    }
-    else
-    {
-        switch (JoinStatus)
-        {
-            case NetSetupDomainName:
-                SetDlgItemText(hDlg, 116, JoinName);
-                SetRadioBtnState(hDlg, TRUE);
-                break;
-
-            case NetSetupWorkgroupName:
-                SetDlgItemText(hDlg, 1007, JoinName);
-                SetRadioBtnState(hDlg, FALSE);
-                break;
-
-            case NetSetupUnjoined:
-                break;
-
-            case NetSetupUnknownStatus:
-            default:
-                SetRadioBtnState(hDlg, FALSE);
-
-                if (NetWkstaGetInfo(NULL,
-                                    101,
-                                    (LPBYTE*)&wki) == NERR_Success)
-                {
-                    SetDlgItemText(hDlg,
-                                   1007,
-                                   wki->wki101_langroup);
-                }
-                else
-                {
-                    DisableControls(hDlg);
-                }
-
-                if (wki)
-                    NetApiBufferFree(wki);
-                break;
-        }
-
-        if (JoinName)
-            NetApiBufferFree(JoinName);
+        default:
+            break;
     }
 }
 
@@ -412,6 +440,8 @@ NetworkDlg_OnOK(
     PNETIDDATA pNetIdData)
 {
     WCHAR szMsgText[MAX_PATH], szMsgTitle[MAX_PATH];
+    HKEY KeyHandle;
+    DWORD dwError;
 
     if (pNetIdData->bHostNameChanged)
     {
@@ -429,6 +459,8 @@ NetworkDlg_OnOK(
             MessageBoxW(hDlg, szMsgText, NULL, MB_OK | MB_ICONERROR);
             return FALSE;
         }
+
+        pNetIdData->bHostNameChanged = FALSE;
     }
 
     if (pNetIdData->bDomainNameChanged)
@@ -438,6 +470,29 @@ NetworkDlg_OnOK(
             /* FIXME: Show error message */
             return FALSE;
         }
+
+        pNetIdData->bDomainNameChanged = FALSE;
+    }
+
+    if (pNetIdData->bSyncDomainWithMembershipChanged)
+    {
+        dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+                                L"SYSTEM\\CurrentControlSet\\Services\\TcpIp\\Parameters",
+                                0,
+                                KEY_SET_VALUE,
+                                &KeyHandle);
+        if (dwError == ERROR_SUCCESS)
+        {
+            RegSetValueExW(KeyHandle,
+                           L"SyncDomainWithMembership",
+                           0,
+                           REG_DWORD,
+                           (LPBYTE)pNetIdData->bSyncDomainWithMembership,
+                           sizeof(pNetIdData->bSyncDomainWithMembership));
+            RegCloseKey(KeyHandle);
+        }
+
+        pNetIdData->bSyncDomainWithMembershipChanged = FALSE;
     }
 
     LoadStringW(hDllInstance, 4000, szMsgTitle, ARRAYSIZE(szMsgTitle));
@@ -524,7 +579,7 @@ NetIDPage_OnInitDialog(
     WCHAR ComputerDescription[MAX_COMPUTERDESCRIPTION_LENGTH + 1];
     DWORD RegSize = sizeof(ComputerDescription);
     HKEY KeyHandle;
-    LPWKSTA_INFO_101 wki;
+    WCHAR szBuffer[512];
     LONG lError;
 
     /* Display computer name and description */
@@ -552,11 +607,10 @@ NetIDPage_OnInitDialog(
         RegCloseKey(KeyHandle);
     }
 
-    if (NetWkstaGetInfo(NULL, 101, (LPBYTE*)&wki) == NERR_Success)
-    {
-        SetDlgItemText(hwndDlg, IDC_WORKGROUPDOMAIN_NAME, wki->wki101_langroup);
-        NetApiBufferFree(wki);
-    }
+    /* Set the workgroup or domain name */
+    LoadStringW(hDllInstance, (pNetIdData->JoinStatus == NetSetupDomainName)? 6 : 5, szBuffer, ARRAYSIZE(szBuffer));
+    SetDlgItemText(hwndDlg, IDC_WORKGROUPDOMAIN, szBuffer);
+    SetDlgItemText(hwndDlg, IDC_WORKGROUPDOMAIN_NAME, pNetIdData->JoinName);
 }
 
 static
@@ -637,6 +691,7 @@ NetIDPageProc(IN HWND hwndDlg,
                 SetFullComputerName(hwndDlg, IDC_COMPUTERNAME, pNetIdData);
                 NetIDPage_OnInitDialog(hwndDlg, pNetIdData);
                 pNetIdData->bEnable = TRUE;
+                CheckForChangedNames(hwndDlg, pNetIdData);
             }
             return TRUE;
 
@@ -665,6 +720,7 @@ NetIDPageProc(IN HWND hwndDlg,
                                        (LPARAM)pNetIdData))
                     {
                         UpdateFullComputerName(hwndDlg, IDC_COMPUTERNAME, pNetIdData);
+                        CheckForChangedNames(hwndDlg, pNetIdData);
                     }
                     break;
             }
@@ -673,6 +729,8 @@ NetIDPageProc(IN HWND hwndDlg,
         case WM_DESTROY:
             if (pNetIdData != NULL)
             {
+                if (pNetIdData->JoinName != NULL)
+                    NetApiBufferFree(pNetIdData->JoinName);
                 HeapFree(GetProcessHeap(), 0, pNetIdData);
                 pNetIdData = NULL;
                 SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)NULL);
diff --git a/dll/win32/netid/resource.h b/dll/win32/netid/resource.h
index ec1a769b96d..b3fbbe4dcb1 100644
--- a/dll/win32/netid/resource.h
+++ b/dll/win32/netid/resource.h
@@ -17,3 +17,6 @@
 #define IDC_WORKGROUPDOMAIN      204
 #define IDC_NETWORK_ID           205
 #define IDC_NETWORK_PROPERTY     206
+#define IDC_MESSAGETEXT          207
+#define IDC_RESTARTICON          208
+#define IDC_RESTARTTEXT          209