diff --git a/reactos/dll/win32/msgina/gui.c b/reactos/dll/win32/msgina/gui.c
index 32d08fbc767..1f05ae26c06 100644
--- a/reactos/dll/win32/msgina/gui.c
+++ b/reactos/dll/win32/msgina/gui.c
@@ -603,6 +603,59 @@ SetLockMessage(HWND hwnd,
 }
 
 
+static
+BOOL
+DoUnlock(
+    IN HWND hwndDlg,
+    IN PGINA_CONTEXT pgContext,
+    OUT LPINT Action)
+{
+    WCHAR Buffer1[256];
+    WCHAR Buffer2[256];
+    LPWSTR UserName = NULL;
+    LPWSTR Password = NULL;
+    BOOL res = FALSE;
+
+    if (GetTextboxText(hwndDlg, IDC_USERNAME, &UserName) && *UserName == '\0')
+        return FALSE;
+
+    if (GetTextboxText(hwndDlg, IDC_PASSWORD, &Password))
+    {
+        if (UserName != NULL && Password != NULL &&
+            wcscmp(UserName, pgContext->UserName) == 0 &&
+            wcscmp(Password, pgContext->Password) == 0)
+        {
+            *Action = WLX_SAS_ACTION_UNLOCK_WKSTA;
+            res = TRUE;
+        }
+        else if (wcscmp(UserName, pgContext->UserName) == 0 &&
+                 wcscmp(Password, pgContext->Password) != 0)
+        {
+            /* Wrong Password */
+            LoadStringW(pgContext->hDllInstance, IDS_LOCKEDWRONGPASSWORD, Buffer2, 256);
+            LoadStringW(pgContext->hDllInstance, IDS_COMPUTERLOCKED, Buffer1, 256);
+            MessageBoxW(hwndDlg, Buffer2, Buffer1, MB_OK | MB_ICONERROR);
+        }
+        else
+        {
+            /* Wrong user name */
+            LoadStringW(pgContext->hDllInstance, IDS_LOCKEDWRONGUSER, Buffer1, 256);
+            wsprintfW(Buffer2, Buffer1, pgContext->Domain, pgContext->UserName);
+            LoadStringW(pgContext->hDllInstance, IDS_COMPUTERLOCKED, Buffer1, 256);
+            MessageBoxW(hwndDlg, Buffer2, Buffer1, MB_OK | MB_ICONERROR);
+        }
+    }
+
+    if (UserName != NULL)
+        HeapFree(GetProcessHeap(), 0, UserName);
+
+    if (Password != NULL)
+        HeapFree(GetProcessHeap(), 0, Password);
+
+    return res;
+}
+
+
 static
 INT_PTR
 CALLBACK
@@ -613,6 +666,7 @@ UnlockWindowProc(
     IN LPARAM lParam)
 {
     PGINA_CONTEXT pgContext;
+    INT result = WLX_SAS_ACTION_NONE;
 
     pgContext = (PGINA_CONTEXT)GetWindowLongPtr(hwndDlg, GWL_USERDATA);
 
@@ -653,26 +707,9 @@ UnlockWindowProc(
             switch (LOWORD(wParam))
             {
                 case IDOK:
-                {
-                    LPWSTR UserName = NULL, Password = NULL;
-                    INT result = WLX_SAS_ACTION_NONE;
-
-                    if (GetTextboxText(hwndDlg, IDC_USERNAME, &UserName) && *UserName == '\0')
-                        break;
-                    if (GetTextboxText(hwndDlg, IDC_PASSWORD, &Password))
-                    {
-                        if (UserName != NULL && Password != NULL &&
-                            wcscmp(UserName, pgContext->UserName) == 0 &&
-                            wcscmp(Password, pgContext->Password) == 0)
-                        {
-                            result = WLX_SAS_ACTION_UNLOCK_WKSTA;
-                        }
-                    }
-                    HeapFree(GetProcessHeap(), 0, UserName);
-                    HeapFree(GetProcessHeap(), 0, Password);
-                    EndDialog(hwndDlg, result);
+                    if (DoUnlock(hwndDlg, pgContext, &result))
+                        EndDialog(hwndDlg, result);
                     return TRUE;
-                }
 
                 case IDCANCEL:
                     EndDialog(hwndDlg, WLX_SAS_ACTION_NONE);
diff --git a/reactos/dll/win32/msgina/lang/bg-BG.rc b/reactos/dll/win32/msgina/lang/bg-BG.rc
index 34b52d7dfd0..2a048c87129 100644
--- a/reactos/dll/win32/msgina/lang/bg-BG.rc
+++ b/reactos/dll/win32/msgina/lang/bg-BG.rc
@@ -122,4 +122,7 @@ BEGIN
     IDS_LOCKMSG "Only %s or an Administrator can unlock this computer."
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Logon date: %s %s"
+    IDS_COMPUTERLOCKED "Computer locked"
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
 END
diff --git a/reactos/dll/win32/msgina/lang/cs-CZ.rc b/reactos/dll/win32/msgina/lang/cs-CZ.rc
index 0a0acd16bdc..54a2468213e 100644
--- a/reactos/dll/win32/msgina/lang/cs-CZ.rc
+++ b/reactos/dll/win32/msgina/lang/cs-CZ.rc
@@ -127,4 +127,7 @@ BEGIN
     IDS_LOCKMSG "Pouze %s nebo Administrátor může odemknout tento počítač."
     IDS_LOGONMSG "Jste přihlášeni jako %s."
     IDS_LOGONDATE "Datum přihlášení: %s %s"
+    IDS_COMPUTERLOCKED "Computer locked"
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
 END
diff --git a/reactos/dll/win32/msgina/lang/de-DE.rc b/reactos/dll/win32/msgina/lang/de-DE.rc
index 9114eec5625..f540fff326f 100644
--- a/reactos/dll/win32/msgina/lang/de-DE.rc
+++ b/reactos/dll/win32/msgina/lang/de-DE.rc
@@ -122,4 +122,7 @@ BEGIN
     IDS_LOCKMSG "Nur %s oder ein Administrator kann den Computer entsperren."
     IDS_LOGONMSG "Sie sind angemeldet als %s."
     IDS_LOGONDATE "Anmeldedatum: %s %s"
+    IDS_COMPUTERLOCKED "Computer ist gesperrt"
+    IDS_LOCKEDWRONGPASSWORD "Das Kennwort ist falsch.  Bitte geben Sie das Kennwort erneut ein.  Bei Buchstaben des Kennworts wird Groß- und Kleinschreibung unterschieden."
+    IDS_LOCKEDWRONGUSER "Der Computer ist gesperrt.  Nur %s\\%s oder ein Administrator kann den Computer entsperren."
 END
diff --git a/reactos/dll/win32/msgina/lang/en-US.rc b/reactos/dll/win32/msgina/lang/en-US.rc
index 453ad6c51cf..b94d71f53e5 100644
--- a/reactos/dll/win32/msgina/lang/en-US.rc
+++ b/reactos/dll/win32/msgina/lang/en-US.rc
@@ -46,7 +46,7 @@ BEGIN
     PUSHBUTTON "Lock computer", IDC_LOCK, 10, 135, 76, 14
     PUSHBUTTON "Log off...", IDC_LOGOFF, 100, 135, 75, 14
     PUSHBUTTON "Shutdown", IDC_SHUTDOWN, 189, 135, 76, 14
-    PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14, WS_DISABLED
+    PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14
     PUSHBUTTON "Task manager", IDC_TASKMGR, 100, 154, 75, 14
     PUSHBUTTON "Cancel", IDCANCEL, 189, 154, 76, 14
 END
@@ -122,4 +122,7 @@ BEGIN
     IDS_LOCKMSG "Only %s or an Administrator can unlock this computer."
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Logon date: %s %s"
+    IDS_COMPUTERLOCKED "Computer locked"
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
 END
diff --git a/reactos/dll/win32/msgina/lang/es-ES.rc b/reactos/dll/win32/msgina/lang/es-ES.rc
index ab0d4f359cb..929ebee4461 100644
--- a/reactos/dll/win32/msgina/lang/es-ES.rc
+++ b/reactos/dll/win32/msgina/lang/es-ES.rc
@@ -124,4 +124,7 @@ BEGIN
     IDS_LOCKMSG "Only %s or an Administrator can unlock this computer."
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Logon date: %s %s"
+    IDS_COMPUTERLOCKED "Computer locked"
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
 END
diff --git a/reactos/dll/win32/msgina/lang/fr-FR.rc b/reactos/dll/win32/msgina/lang/fr-FR.rc
index b2fbc423d3f..f0e09b25ab1 100644
--- a/reactos/dll/win32/msgina/lang/fr-FR.rc
+++ b/reactos/dll/win32/msgina/lang/fr-FR.rc
@@ -122,4 +122,7 @@ BEGIN
     IDS_LOCKMSG "Seulement %s ou bien un Administrateur peut déverrouiller cet ordinateur."
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Logon date: %s %s"
+    IDS_COMPUTERLOCKED "Computer locked"
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
 END
diff --git a/reactos/dll/win32/msgina/lang/he-IL.rc b/reactos/dll/win32/msgina/lang/he-IL.rc
index 33b2290ea5a..5f59f139ad7 100644
--- a/reactos/dll/win32/msgina/lang/he-IL.rc
+++ b/reactos/dll/win32/msgina/lang/he-IL.rc
@@ -122,4 +122,7 @@ BEGIN
     IDS_LOCKMSG "רק %s או מנהל יכולים לשחרר את המחשב הזה."
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "תאריך כניסה: %s %s"
+    IDS_COMPUTERLOCKED "Computer locked"
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
 END
diff --git a/reactos/dll/win32/msgina/lang/id-ID.rc b/reactos/dll/win32/msgina/lang/id-ID.rc
index 5e851b8877a..924a0aebdf0 100644
--- a/reactos/dll/win32/msgina/lang/id-ID.rc
+++ b/reactos/dll/win32/msgina/lang/id-ID.rc
@@ -121,4 +121,7 @@ BEGIN
     IDS_FORCELOGOFF "Ini akan mengeluarkan pengguna saat ini dan kehilangan data yang belum disimpan.  Lanjutkan?"
     IDS_LOCKMSG "Only %s or an Administrator can unlock this computer."
     IDS_LOGONDATE "Logon date: %s %s"
+    IDS_COMPUTERLOCKED "Computer locked"
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
 END
diff --git a/reactos/dll/win32/msgina/lang/it-IT.rc b/reactos/dll/win32/msgina/lang/it-IT.rc
index 9bead5a318f..19596a1b9b7 100644
--- a/reactos/dll/win32/msgina/lang/it-IT.rc
+++ b/reactos/dll/win32/msgina/lang/it-IT.rc
@@ -130,4 +130,7 @@ BEGIN
     IDS_LOCKMSG "Solo %s o un Amministratore possono sbloccare questo computer."
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Dati di accesso: %s %s"
+    IDS_COMPUTERLOCKED "Computer locked"
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
 END
diff --git a/reactos/dll/win32/msgina/lang/ja-JP.rc b/reactos/dll/win32/msgina/lang/ja-JP.rc
index e235775ce57..023ed6cd546 100644
--- a/reactos/dll/win32/msgina/lang/ja-JP.rc
+++ b/reactos/dll/win32/msgina/lang/ja-JP.rc
@@ -122,4 +122,7 @@ BEGIN
     IDS_LOCKMSG "Only %s or an Administrator can unlock this computer."
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Logon date: %s %s"
+    IDS_COMPUTERLOCKED "Computer locked"
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
 END
diff --git a/reactos/dll/win32/msgina/lang/no-NO.rc b/reactos/dll/win32/msgina/lang/no-NO.rc
index 03e37f48a45..1bf186511bf 100644
--- a/reactos/dll/win32/msgina/lang/no-NO.rc
+++ b/reactos/dll/win32/msgina/lang/no-NO.rc
@@ -122,4 +122,7 @@ BEGIN
     IDS_LOCKMSG "Only %s or an Administrator can unlock this computer."
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Logon date: %s %s"
+    IDS_COMPUTERLOCKED "Computer locked"
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
 END
diff --git a/reactos/dll/win32/msgina/lang/pl-PL.rc b/reactos/dll/win32/msgina/lang/pl-PL.rc
index bbb5379dd6e..1722f8579d6 100644
--- a/reactos/dll/win32/msgina/lang/pl-PL.rc
+++ b/reactos/dll/win32/msgina/lang/pl-PL.rc
@@ -131,4 +131,7 @@ BEGIN
     IDS_LOCKMSG "Tylko %s lub Administrator może odblokować ten komputer."
     IDS_LOGONMSG "Jesteś zalogowany jako %s."
     IDS_LOGONDATE "Data logowania: %s %s"
+    IDS_COMPUTERLOCKED "Computer locked"
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
 END
diff --git a/reactos/dll/win32/msgina/lang/ro-RO.rc b/reactos/dll/win32/msgina/lang/ro-RO.rc
index b3c9c17fc01..2624eeb335d 100644
--- a/reactos/dll/win32/msgina/lang/ro-RO.rc
+++ b/reactos/dll/win32/msgina/lang/ro-RO.rc
@@ -124,4 +124,7 @@ BEGIN
     IDS_LOCKMSG "Doar %s sau un Administrator poate debloca acest calculator."
     IDS_LOGONMSG "Sunteți autentificat ca %s."
     IDS_LOGONDATE "Data autentificării: %s %s"
+    IDS_COMPUTERLOCKED "Computer locked"
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
 END
diff --git a/reactos/dll/win32/msgina/lang/ru-RU.rc b/reactos/dll/win32/msgina/lang/ru-RU.rc
index e362a306227..eaba616da25 100644
--- a/reactos/dll/win32/msgina/lang/ru-RU.rc
+++ b/reactos/dll/win32/msgina/lang/ru-RU.rc
@@ -124,4 +124,7 @@ BEGIN
     IDS_LOCKMSG "Только %s или Администратор могут разблокировать этот компьютер."
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Дата входа: %s %s"
+    IDS_COMPUTERLOCKED "Computer locked"
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
 END
diff --git a/reactos/dll/win32/msgina/lang/sk-SK.rc b/reactos/dll/win32/msgina/lang/sk-SK.rc
index 77dd4dd5de4..6956d1bf68a 100644
--- a/reactos/dll/win32/msgina/lang/sk-SK.rc
+++ b/reactos/dll/win32/msgina/lang/sk-SK.rc
@@ -127,4 +127,7 @@ BEGIN
     IDS_LOCKMSG "Only %s or an Administrator can unlock this computer."
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Logon date: %s %s"
+    IDS_COMPUTERLOCKED "Computer locked"
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
 END
diff --git a/reactos/dll/win32/msgina/lang/tr-TR.rc b/reactos/dll/win32/msgina/lang/tr-TR.rc
index a6a0ffbda7c..ba61e2740ce 100644
--- a/reactos/dll/win32/msgina/lang/tr-TR.rc
+++ b/reactos/dll/win32/msgina/lang/tr-TR.rc
@@ -124,4 +124,7 @@ BEGIN
     IDS_LOCKMSG "Yalnızca %s ve bir yönetici bu bilgisayarı kilitleyebilir."
     IDS_LOGONMSG "%s olarak oturum açtınız."
     IDS_LOGONDATE "Oturum Açma Zamânı: %s %s"
+    IDS_COMPUTERLOCKED "Computer locked"
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
 END
diff --git a/reactos/dll/win32/msgina/lang/uk-UA.rc b/reactos/dll/win32/msgina/lang/uk-UA.rc
index fca62ab6c3e..2d386342660 100644
--- a/reactos/dll/win32/msgina/lang/uk-UA.rc
+++ b/reactos/dll/win32/msgina/lang/uk-UA.rc
@@ -130,4 +130,7 @@ BEGIN
     IDS_LOCKMSG "Only %s or an Administrator can unlock this computer."
     IDS_LOGONMSG "You are logged on as %s."
     IDS_LOGONDATE "Logon date: %s %s"
+    IDS_COMPUTERLOCKED "Computer locked"
+    IDS_LOCKEDWRONGPASSWORD "The password is wrong.  Please enter your password again.  Letters in passwords must be typed using the correct case."
+    IDS_LOCKEDWRONGUSER "This computer is locked.  Only %s\\%s or an Administrator can unlock this computer."
 END
diff --git a/reactos/dll/win32/msgina/resource.h b/reactos/dll/win32/msgina/resource.h
index bc4ab5aecf7..148c8dc66ea 100644
--- a/reactos/dll/win32/msgina/resource.h
+++ b/reactos/dll/win32/msgina/resource.h
@@ -34,12 +34,15 @@
 
 #define IDI_LOCKICON 21
 
-#define IDS_LOGGEDOUTSAS       40000
-#define IDS_LOCKEDSAS          40001
-#define IDS_PRESSCTRLALTDELETE 40002
-#define IDS_ASKFORUSER         40003
-#define IDS_ASKFORPASSWORD     40004
-#define IDS_FORCELOGOFF        40005
-#define IDS_LOCKMSG            40006
-#define IDS_LOGONMSG           40007
-#define IDS_LOGONDATE          40008
+#define IDS_LOGGEDOUTSAS        40000
+#define IDS_LOCKEDSAS           40001
+#define IDS_PRESSCTRLALTDELETE  40002
+#define IDS_ASKFORUSER          40003
+#define IDS_ASKFORPASSWORD      40004
+#define IDS_FORCELOGOFF         40005
+#define IDS_LOCKMSG             40006
+#define IDS_LOGONMSG            40007
+#define IDS_LOGONDATE           40008
+#define IDS_COMPUTERLOCKED      40009
+#define IDS_LOCKEDWRONGPASSWORD 40010
+#define IDS_LOCKEDWRONGUSER     40011