diff --git a/reactos/dll/win32/msgina/gui.c b/reactos/dll/win32/msgina/gui.c
index 82a07925852..ffd564146b3 100644
--- a/reactos/dll/win32/msgina/gui.c
+++ b/reactos/dll/win32/msgina/gui.c
@@ -217,6 +217,35 @@ GetTextboxText(
 	return TRUE;
 }
 
+static VOID
+OnInitSecurityDlg(HWND hwnd,
+                  PGINA_CONTEXT pgContext)
+{
+    WCHAR Buffer1[256];
+    WCHAR Buffer2[256];
+    WCHAR Buffer3[256];
+    WCHAR Buffer4[512];
+
+    LoadStringW(pgContext->hDllInstance, IDS_LOGONMSG, Buffer1, 256);
+
+    wsprintfW(Buffer2, L"%s\\%s", pgContext->Domain, pgContext->UserName);
+    wsprintfW(Buffer4, Buffer1, Buffer2);
+
+    SetDlgItemTextW(hwnd, IDC_LOGONMSG, Buffer4);
+
+    LoadStringW(pgContext->hDllInstance, IDS_LOGONDATE, Buffer1, 256);
+
+    GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE,
+                   (SYSTEMTIME*)&pgContext->LogonTime, NULL, Buffer2, 256);
+
+    GetTimeFormatW(LOCALE_USER_DEFAULT, 0,
+                   (SYSTEMTIME*)&pgContext->LogonTime, NULL, Buffer3, 256);
+
+    wsprintfW(Buffer4, Buffer1, Buffer2, Buffer3);
+
+    SetDlgItemTextW(hwnd, IDC_LOGONDATE, Buffer4);
+}
+
 static INT_PTR CALLBACK
 LoggedOnWindowProc(
 	IN HWND hwndDlg,
@@ -224,10 +253,15 @@ LoggedOnWindowProc(
 	IN WPARAM wParam,
 	IN LPARAM lParam)
 {
-	UNREFERENCED_PARAMETER(lParam);
-
 	switch (uMsg)
 	{
+		case WM_INITDIALOG:
+		{
+			OnInitSecurityDlg(hwndDlg, (PGINA_CONTEXT)lParam);
+			SetFocus(GetDlgItem(hwndDlg, IDNO));
+			return TRUE;
+		}
+
 		case WM_COMMAND:
 		{
 			switch (LOWORD(wParam))
@@ -250,11 +284,6 @@ LoggedOnWindowProc(
 			}
 			break;
 		}
-		case WM_INITDIALOG:
-		{
-			SetFocus(GetDlgItem(hwndDlg, IDNO));
-			return TRUE;
-		}
 		case WM_CLOSE:
 		{
 			EndDialog(hwndDlg, WLX_SAS_ACTION_NONE);
@@ -416,8 +445,7 @@ GUILockedSAS(
 
 static VOID
 OnInitLockedDlg(HWND hwnd,
-                PGINA_CONTEXT pgContext,
-                UINT id)
+                PGINA_CONTEXT pgContext)
 {
     WCHAR Buffer1[256];
     WCHAR Buffer2[256];
@@ -428,7 +456,7 @@ OnInitLockedDlg(HWND hwnd,
     wsprintfW(Buffer2, L"%s\\%s", pgContext->Domain, pgContext->UserName);
     wsprintfW(Buffer3, Buffer1, Buffer2);
 
-    SetWindowTextW(GetDlgItem(hwnd, id), Buffer3);
+    SetDlgItemTextW(hwnd, IDC_LOCKMSG, Buffer3);
 }
 
 
@@ -451,7 +479,7 @@ LockedWindowProc(
 			SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pgContext);
 
 			pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
-			OnInitLockedDlg(hwndDlg, pgContext, IDC_LOCKMSG);
+			OnInitLockedDlg(hwndDlg, pgContext);
 			return TRUE;
 		}
 		case WM_PAINT:
diff --git a/reactos/dll/win32/msgina/lang/bg-BG.rc b/reactos/dll/win32/msgina/lang/bg-BG.rc
index d47b91f834f..32f0e21a63c 100644
--- a/reactos/dll/win32/msgina/lang/bg-BG.rc
+++ b/reactos/dll/win32/msgina/lang/bg-BG.rc
@@ -33,18 +33,21 @@ BEGIN
     PUSHBUTTON      "Изключване",IDC_SHUTDOWN,179,122,50,14
 END
 
-IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116
+IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Сигурност"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
     CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
-    LTEXT           "Какво желаете?",IDC_STATIC,86,60,87,8
-    PUSHBUTTON      "Заключване на компютъра",IDC_LOCK,25,95,99,14
-    PUSHBUTTON      "Изход",IDC_LOGOFF,90,76,75,14
-    PUSHBUTTON      "Изключване",IDC_SHUTDOWN,170,76,75,14
-    PUSHBUTTON      "Задачен управител",IDC_TASKMGR,10,76,75,14
-    PUSHBUTTON      "Отказ",IDCANCEL,130,95,99,14
+    GROUPBOX        "Logon Information",IDC_STATIC,7,61,261,52
+    LTEXT           "<Message>",IDC_LOGONMSG,15,73,245,18
+    LTEXT           "<Logon date>",IDC_LOGONDATE,15,94,245,8
+    CTEXT           "Какво желаете?",IDC_STATIC,10,119,255,8
+    PUSHBUTTON      "Заключване на компютъра",IDC_LOCK,25,154,99,14
+    PUSHBUTTON      "Изход",IDC_LOGOFF,90,135,75,14
+    PUSHBUTTON      "Изключване",IDC_SHUTDOWN,170,135,75,14
+    PUSHBUTTON      "Задачен управител",IDC_TASKMGR,10,135,75,14
+    PUSHBUTTON      "Отказ",IDCANCEL,130,154,99,14
 END
 
 IDD_LOCKED_DLG DIALOGEX 0,0,275,121
@@ -85,4 +88,5 @@ BEGIN
     IDS_ASKFORPASSWORD "Парола: "
     IDS_FORCELOGOFF "Така текущият потребител ще излезе и ще изгуби всички несъхранени данни. Да продължа ли?"
     IDS_LOCKMSG "Only %s or an Administrator can unlock this computer."
-END
+    IDS_LOGONDATE "Logon date: %s %s"
+    END
diff --git a/reactos/dll/win32/msgina/lang/cs-CZ.rc b/reactos/dll/win32/msgina/lang/cs-CZ.rc
index 6362eadd814..022643ace94 100644
--- a/reactos/dll/win32/msgina/lang/cs-CZ.rc
+++ b/reactos/dll/win32/msgina/lang/cs-CZ.rc
@@ -39,18 +39,21 @@ BEGIN
     PUSHBUTTON      "Vypnout",IDC_SHUTDOWN,179,122,50,14
 END
 
-IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116
+IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Bezpečnost"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
     CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
-    LTEXT           "Co chcete udělat?",IDC_STATIC,86,60,87,8
-    PUSHBUTTON      "Uzamknout počítač",IDC_LOCK,10,76,70,14
-    PUSHBUTTON      "Odhlásit",IDC_LOGOFF,90,76,70,14
-    PUSHBUTTON      "Vypnout",IDC_SHUTDOWN,170,76,70,14
-    PUSHBUTTON      "Správce úloh",IDC_TASKMGR,90,95,70,14
-    PUSHBUTTON      "Storno",IDCANCEL,170,95,70,14
+    GROUPBOX        "Logon Information",IDC_STATIC,7,61,261,52
+    LTEXT           "<Message>",IDC_LOGONMSG,15,73,245,18
+    LTEXT           "<Logon date>",IDC_LOGONDATE,15,94,245,8
+    CTEXT           "Co chcete udělat?",IDC_STATIC,10,119,255,8
+    PUSHBUTTON      "Uzamknout počítač",IDC_LOCK,10,135,70,14
+    PUSHBUTTON      "Odhlásit",IDC_LOGOFF,90,135,70,14
+    PUSHBUTTON      "Vypnout",IDC_SHUTDOWN,170,135,70,14
+    PUSHBUTTON      "Správce úloh",IDC_TASKMGR,90,154,70,14
+    PUSHBUTTON      "Storno",IDCANCEL,170,154,70,14
 END
 
 IDD_LOCKED_DLG DIALOGEX 0,0,275,121
@@ -91,4 +94,5 @@ BEGIN
     IDS_ASKFORPASSWORD "Heslo: "
     IDS_FORCELOGOFF "Současný uživatel bude odhlášen a všechna jeho neuložená data ztracena. Pokračovat?"
     IDS_LOCKMSG "Only %s or an Administrator can unlock this computer."
+    IDS_LOGONDATE "Logon date: %s %s"
 END
diff --git a/reactos/dll/win32/msgina/lang/de-DE.rc b/reactos/dll/win32/msgina/lang/de-DE.rc
index 44181be603d..f33574f4b9b 100644
--- a/reactos/dll/win32/msgina/lang/de-DE.rc
+++ b/reactos/dll/win32/msgina/lang/de-DE.rc
@@ -33,18 +33,21 @@ BEGIN
     PUSHBUTTON      "Herunterfahren",IDC_SHUTDOWN,165, 122, 64, 14
 END
 
-IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116
+IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Sicherheit"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
     CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
-    LTEXT           "Was wollen Sie tun?",IDC_STATIC,86,60,87,8
-    PUSHBUTTON      "Computer sperren",IDC_LOCK,10,76,70,14
-    PUSHBUTTON      "Abmelden",IDC_LOGOFF,90,76,70,14
-    PUSHBUTTON      "Herunterfahren",IDC_SHUTDOWN,170,76,70,14
-    PUSHBUTTON      "Taskmanager",IDC_TASKMGR,90,95,70,14
-    PUSHBUTTON      "Abbrechen",IDCANCEL,170,95,70,14
+    GROUPBOX        "Anmeldeinformation",IDC_STATIC,7,61,261,52
+    LTEXT           "<Message>",IDC_LOGONMSG,15,73,245,18
+    LTEXT           "<Logon date>",IDC_LOGONDATE,15,94,245,8
+    CTEXT           "Was wollen Sie tun?",IDC_STATIC,10,119,255,8
+    PUSHBUTTON      "Computer sperren",IDC_LOCK,10,135,76,14
+    PUSHBUTTON      "Abmelden",IDC_LOGOFF,100,135,75,14
+    PUSHBUTTON      "Herunterfahren",IDC_SHUTDOWN,189,135,76,14
+    PUSHBUTTON      "Taskmanager",IDC_TASKMGR,100,154,75,14
+    PUSHBUTTON      "Abbrechen",IDCANCEL,189,154,76,14
 END
 
 IDD_LOCKED_DLG DIALOGEX 0,0,275,121
@@ -85,4 +88,5 @@ BEGIN
     IDS_ASKFORPASSWORD "Passwort: "
     IDS_FORCELOGOFF "Dies wird den derzeitigen Benutzer abmelden. Alle ungespeicherten Daten gehen verloren. Fortsetzen?"
     IDS_LOCKMSG "Nur %s oder ein Administrator kann den Computer entsperren."
+    IDS_LOGONDATE "Anmeldedatum: %s %s"
 END
diff --git a/reactos/dll/win32/msgina/lang/en-US.rc b/reactos/dll/win32/msgina/lang/en-US.rc
index da4c1e40db1..32d22874039 100644
--- a/reactos/dll/win32/msgina/lang/en-US.rc
+++ b/reactos/dll/win32/msgina/lang/en-US.rc
@@ -33,18 +33,21 @@ BEGIN
     PUSHBUTTON      "Shutdown",IDC_SHUTDOWN,179,122,50,14
 END
 
-IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116
+IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Security"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
     CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
-    LTEXT           "What do you want to do?",IDC_STATIC,86,60,87,8
-    PUSHBUTTON      "Lock computer",IDC_LOCK,10,76,70,14
-    PUSHBUTTON      "Log off",IDC_LOGOFF,90,76,70,14
-    PUSHBUTTON      "Shutdown",IDC_SHUTDOWN,170,76,70,14
-    PUSHBUTTON      "Task manager",IDC_TASKMGR,90,95,70,14
-    PUSHBUTTON      "Cancel",IDCANCEL,170,95,70,14
+    GROUPBOX        "Logon Information",IDC_STATIC,7,61,261,52
+    LTEXT           "<Message>",IDC_LOGONMSG,15,73,245,18
+    LTEXT           "<Logon date>",IDC_LOGONDATE,15,94,245,8
+    CTEXT           "What do you want to do?",IDC_STATIC,10,119,255,8
+    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      "Task manager",IDC_TASKMGR,100,154,75,14
+    PUSHBUTTON      "Cancel",IDCANCEL,189,154,76,14
 END
 
 IDD_LOCKED_DLG DIALOGEX 0,0,275,121
@@ -85,4 +88,6 @@ BEGIN
     IDS_ASKFORPASSWORD "Password: "
     IDS_FORCELOGOFF "This will log out the current user and lose all unsaved data.  Continue?"
     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"
 END
diff --git a/reactos/dll/win32/msgina/lang/es-ES.rc b/reactos/dll/win32/msgina/lang/es-ES.rc
index e16f4f976ec..cb817e6f270 100644
--- a/reactos/dll/win32/msgina/lang/es-ES.rc
+++ b/reactos/dll/win32/msgina/lang/es-ES.rc
@@ -38,18 +38,21 @@ BEGIN
     PUSHBUTTON      "Cerrar",IDC_SHUTDOWN,179,122,50,14
 END
 
-IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116
+IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Seguridad"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
     CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
-    LTEXT           "¿Qué quieres hacer?",IDC_STATIC, 94, 60, 87, 8
-    PUSHBUTTON      "Bloquear computadora",IDC_LOCK, 4, 76, 83, 14
-    PUSHBUTTON      "Salir",IDC_LOGOFF, 92, 76, 88, 14
-    PUSHBUTTON      "Cerrar",IDC_SHUTDOWN, 186, 76, 70, 14
-    PUSHBUTTON      "Administrador de tareas",IDC_TASKMGR, 92, 95, 88, 14
-    PUSHBUTTON      "Cancelar",IDCANCEL, 186, 95, 70, 14
+    GROUPBOX        "Logon Information",IDC_STATIC,7,61,261,52
+    LTEXT           "<Message>",IDC_LOGONMSG,15,73,245,18
+    LTEXT           "<Logon date>",IDC_LOGONDATE,15,94,245,8
+    CTEXT           "¿Qué quieres hacer?",IDC_STATIC,10,119,255,8
+    PUSHBUTTON      "Bloquear computadora",IDC_LOCK, 4,135, 83, 14
+    PUSHBUTTON      "Salir",IDC_LOGOFF, 92,135, 88, 14
+    PUSHBUTTON      "Cerrar",IDC_SHUTDOWN, 186,135, 70, 14
+    PUSHBUTTON      "Administrador de tareas",IDC_TASKMGR, 92,154, 88, 14
+    PUSHBUTTON      "Cancelar",IDCANCEL, 186,154, 70, 14
 END
 
 IDD_LOCKED_DLG DIALOGEX 0,0,275,121
@@ -90,4 +93,5 @@ BEGIN
     IDS_ASKFORPASSWORD "Contraseña: "
     IDS_FORCELOGOFF "Esto cerrará al usuario actual y perderá todos los datos no guardados.  ¿Desea Continuar?"
     IDS_LOCKMSG "Only %s or an Administrator can unlock this computer."
+    IDS_LOGONDATE "Logon date: %s %s"
 END
diff --git a/reactos/dll/win32/msgina/lang/fr-FR.rc b/reactos/dll/win32/msgina/lang/fr-FR.rc
index 68c9832a694..aafa24687a6 100644
--- a/reactos/dll/win32/msgina/lang/fr-FR.rc
+++ b/reactos/dll/win32/msgina/lang/fr-FR.rc
@@ -33,18 +33,21 @@ BEGIN
     PUSHBUTTON      "Éteindre",IDC_SHUTDOWN,179,122,50,14
 END
 
-IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116
+IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Sécurité"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
     CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
-    LTEXT           "Que voulez-vous faire ?",IDC_STATIC, 94, 60, 87, 8
-    PUSHBUTTON      "Verrouiller l'ordinateur",IDC_LOCK, 4, 76, 82, 14
-    PUSHBUTTON      "Déconnecter",IDC_LOGOFF, 93, 76, 85, 14
-    PUSHBUTTON      "Éteindre",IDC_SHUTDOWN, 184, 76, 70, 14
-    PUSHBUTTON      "Gestionnaire de tâches",IDC_TASKMGR, 93, 95, 85, 14
-    PUSHBUTTON      "Annuler",IDCANCEL, 184, 95, 70, 14
+    GROUPBOX        "Logon Information",IDC_STATIC,7,61,261,52
+    LTEXT           "<Message>",IDC_LOGONMSG,15,73,245,18
+    LTEXT           "<Logon date>",IDC_LOGONDATE,15,94,245,8
+    CTEXT           "Que voulez-vous faire ?",IDC_STATIC,10,119,255,8
+    PUSHBUTTON      "Verrouiller l'ordinateur",IDC_LOCK, 4,135, 82, 14
+    PUSHBUTTON      "Déconnecter",IDC_LOGOFF, 93,135, 85, 14
+    PUSHBUTTON      "Éteindre",IDC_SHUTDOWN, 184,135, 70, 14
+    PUSHBUTTON      "Gestionnaire de tâches",IDC_TASKMGR, 93,154, 85, 14
+    PUSHBUTTON      "Annuler",IDCANCEL, 184,154, 70, 14
 END
 
 IDD_LOCKED_DLG DIALOGEX 0,0,275,121
@@ -85,4 +88,5 @@ BEGIN
     IDS_ASKFORPASSWORD "Mot de passe : "
     IDS_FORCELOGOFF "Cela déconnectera l'utilisateur en cours et perdra les données non sauvées. Continuer ?"
     IDS_LOCKMSG "Seulement %s ou bien un Administrateur peut déverrouiller cet ordinateur."
+    IDS_LOGONDATE "Logon date: %s %s"
 END
diff --git a/reactos/dll/win32/msgina/lang/he-IL.rc b/reactos/dll/win32/msgina/lang/he-IL.rc
index 54a82775674..a2690de4465 100644
--- a/reactos/dll/win32/msgina/lang/he-IL.rc
+++ b/reactos/dll/win32/msgina/lang/he-IL.rc
@@ -33,18 +33,21 @@ BEGIN
     PUSHBUTTON      "כיבוי",IDC_SHUTDOWN,179,122,50,14
 END
 
-IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116
+IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "אבטחה"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
     CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
-    LTEXT           "מה ברצונך לעשות?",IDC_STATIC,86,60,87,8
-    PUSHBUTTON      "לנעול את המחשב",IDC_LOCK,10,76,70,14
-    PUSHBUTTON      "להתנתק",IDC_LOGOFF,90,76,70,14
-    PUSHBUTTON      "לכבות",IDC_SHUTDOWN,170,76,70,14
-    PUSHBUTTON      "מנהל המשימות",IDC_TASKMGR,90,95,70,14
-    PUSHBUTTON      "ביטול",IDCANCEL,170,95,70,14
+    GROUPBOX        "Logon Information",IDC_STATIC,7,61,261,52
+    LTEXT           "<Message>",IDC_LOGONMSG,15,73,245,18
+    LTEXT           "<Logon date>",IDC_LOGONDATE,15,94,245,8
+    CTEXT           "מה ברצונך לעשות?",IDC_STATIC,10,119,255,8
+    PUSHBUTTON      "לנעול את המחשב",IDC_LOCK,10,135,70,14
+    PUSHBUTTON      "להתנתק",IDC_LOGOFF,90,135,70,14
+    PUSHBUTTON      "לכבות",IDC_SHUTDOWN,170,135,70,14
+    PUSHBUTTON      "מנהל המשימות",IDC_TASKMGR,90,154,70,14
+    PUSHBUTTON      "ביטול",IDCANCEL,170,154,70,14
 END
 
 IDD_LOCKED_DLG DIALOGEX 0,0,275,121
@@ -85,4 +88,5 @@ BEGIN
     IDS_ASKFORPASSWORD "סיסמה: "
     IDS_FORCELOGOFF "זה יגרום להתנתקות המשתמש הנוכחי ולאבד את כל המידע שאינו נשמר. להמשיך?"
     IDS_LOCKMSG "Only %s or an Administrator can unlock this computer."
+    IDS_LOGONDATE "Logon date: %s %s"
 END
diff --git a/reactos/dll/win32/msgina/lang/id-ID.rc b/reactos/dll/win32/msgina/lang/id-ID.rc
index d4a222b55ec..62e6dd788c1 100644
--- a/reactos/dll/win32/msgina/lang/id-ID.rc
+++ b/reactos/dll/win32/msgina/lang/id-ID.rc
@@ -33,18 +33,21 @@ BEGIN
     PUSHBUTTON      "Matikan",IDC_SHUTDOWN,179,122,50,14
 END
 
-IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116
+IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Keamanan"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
     CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
-    LTEXT           "Apa yang ingin anda lakukan?",IDC_STATIC,86,60,87,8
-    PUSHBUTTON      "Kunci komputer",IDC_LOCK,10,76,70,14
-    PUSHBUTTON      "Keluar",IDC_LOGOFF,90,76,70,14
-    PUSHBUTTON      "Matikan",IDC_SHUTDOWN,170,76,70,14
-    PUSHBUTTON      "Manager Tugas",IDC_TASKMGR,90,95,70,14
-    PUSHBUTTON      "Batal",IDCANCEL,170,95,70,14
+    GROUPBOX        "Logon Information",IDC_STATIC,7,61,261,52
+    LTEXT           "<Message>",IDC_LOGONMSG,15,73,245,18
+    LTEXT           "<Logon date>",IDC_LOGONDATE,15,94,245,8
+    CTEXT           "Apa yang ingin anda lakukan?",IDC_STATIC,10,119,255,8
+    PUSHBUTTON      "Kunci komputer",IDC_LOCK,10,135,70,14
+    PUSHBUTTON      "Keluar",IDC_LOGOFF,90,135,70,14
+    PUSHBUTTON      "Matikan",IDC_SHUTDOWN,170,135,70,14
+    PUSHBUTTON      "Manager Tugas",IDC_TASKMGR,90,154,70,14
+    PUSHBUTTON      "Batal",IDCANCEL,170,154,70,14
 END
 
 IDD_LOCKED_DLG DIALOGEX 0,0,275,121
@@ -85,4 +88,5 @@ BEGIN
     IDS_ASKFORPASSWORD "Kata sandi: "
     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"
 END
diff --git a/reactos/dll/win32/msgina/lang/it-IT.rc b/reactos/dll/win32/msgina/lang/it-IT.rc
index 507a0505ccb..5f285264970 100644
--- a/reactos/dll/win32/msgina/lang/it-IT.rc
+++ b/reactos/dll/win32/msgina/lang/it-IT.rc
@@ -41,18 +41,21 @@ BEGIN
     PUSHBUTTON      "Spegnimento",IDC_SHUTDOWN,179,122,50,14
 END
 
-IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116
+IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Sicurezza"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
     CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
-    LTEXT           "Cosa volete fare?",IDC_STATIC,86,60,87,8
-    PUSHBUTTON      "Bloccare il computer",IDC_LOCK,10,76,70,14
-    PUSHBUTTON      "Fine sessione",IDC_LOGOFF,90,76,70,14
-    PUSHBUTTON      "Spegnimento",IDC_SHUTDOWN,170,76,70,14
-    PUSHBUTTON      "Task manager",IDC_TASKMGR,90,95,70,14
-    PUSHBUTTON      "Annulla",IDCANCEL,170,95,70,14
+    GROUPBOX        "Logon Information",IDC_STATIC,7,61,261,52
+    LTEXT           "<Message>",IDC_LOGONMSG,15,73,245,18
+    LTEXT           "<Logon date>",IDC_LOGONDATE,15,94,245,8
+    CTEXT           "Cosa volete fare?",IDC_STATIC,10,119,255,8
+    PUSHBUTTON      "Bloccare il computer",IDC_LOCK,10,135,70,14
+    PUSHBUTTON      "Fine sessione",IDC_LOGOFF,90,135,70,14
+    PUSHBUTTON      "Spegnimento",IDC_SHUTDOWN,170,135,70,14
+    PUSHBUTTON      "Task manager",IDC_TASKMGR,90,154,70,14
+    PUSHBUTTON      "Annulla",IDCANCEL,170,154,70,14
 END
 
 IDD_LOCKED_DLG DIALOGEX 0,0,275,121
@@ -93,4 +96,5 @@ BEGIN
     IDS_ASKFORPASSWORD "Password: "
     IDS_FORCELOGOFF "Verrà terminata la sessione dell'utente attuale e tutti i dati non salvati verranno persi.  Volete procedere?"
     IDS_LOCKMSG "Only %s or an Administrator can unlock this computer."
+    IDS_LOGONDATE "Logon date: %s %s"
 END
diff --git a/reactos/dll/win32/msgina/lang/ja-JP.rc b/reactos/dll/win32/msgina/lang/ja-JP.rc
index c62eea1d9d1..79d4399b463 100644
--- a/reactos/dll/win32/msgina/lang/ja-JP.rc
+++ b/reactos/dll/win32/msgina/lang/ja-JP.rc
@@ -33,24 +33,27 @@ BEGIN
     PUSHBUTTON      "シャットダウン",IDC_SHUTDOWN,179,122,50,14
 END
 
-IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116
+IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "セキュリティ"
 FONT 9, "MS UI Gothic",400,0,1
 BEGIN
     CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
-    LTEXT           "何をしますか?",IDC_STATIC,86,60,87,8
-    PUSHBUTTON      "コンピュータのロック",IDC_LOCK,10,76,70,14
-    PUSHBUTTON      "ログオフ",IDC_LOGOFF,90,76,70,14
-    PUSHBUTTON      "シャットダウン",IDC_SHUTDOWN,170,76,70,14
-    PUSHBUTTON      "タスク マネージャ",IDC_TASKMGR,90,95,70,14
-    PUSHBUTTON      "キャンセル",IDCANCEL,170,95,70,14
+    GROUPBOX        "Logon Information",IDC_STATIC,7,61,261,52
+    LTEXT           "<Message>",IDC_LOGONMSG,15,73,245,18
+    LTEXT           "<Logon date>",IDC_LOGONDATE,15,94,245,8
+    CTEXT           "何をしますか?",IDC_STATIC,10,119,255,8
+    PUSHBUTTON      "コンピュータのロック",IDC_LOCK,10,135,70,14
+    PUSHBUTTON      "ログオフ",IDC_LOGOFF,90,135,70,14
+    PUSHBUTTON      "シャットダウン",IDC_SHUTDOWN,170,135,70,14
+    PUSHBUTTON      "タスク マネージャ",IDC_TASKMGR,90,154,70,14
+    PUSHBUTTON      "キャンセル",IDCANCEL,170,154,70,14
 END
 
 IDD_LOCKED_DLG DIALOGEX 0,0,275,121
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Computer Locked"
-FONT 8,"MS Shell Dlg",400,0,1
+FONT 9,"MS UI Gothic",400,0,1
 BEGIN
     CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
     ICON            IDI_LOCKICON,-1,7,59,20,20
@@ -62,7 +65,7 @@ END
 IDD_UNLOCK_DLG DIALOGEX 0,0,275,179
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Unlock Computer"
-FONT 8,"MS Shell Dlg",400,0,1
+FONT 9,"MS UI Gothic",400,0,1
 BEGIN
     CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
     ICON            IDI_LOCKICON,-1,7,59,20,20
@@ -85,4 +88,5 @@ BEGIN
     IDS_ASKFORPASSWORD      "パスワード: "
     IDS_FORCELOGOFF         "現在のユーザーをログアウトします。保存されていないデータはすべて失われます。 続行しますか?"
     IDS_LOCKMSG "Only %s or an Administrator can unlock this computer."
+    IDS_LOGONDATE "Logon date: %s %s"
 END
diff --git a/reactos/dll/win32/msgina/lang/no-NO.rc b/reactos/dll/win32/msgina/lang/no-NO.rc
index df40ef84e76..00d6ff1b3e8 100644
--- a/reactos/dll/win32/msgina/lang/no-NO.rc
+++ b/reactos/dll/win32/msgina/lang/no-NO.rc
@@ -33,18 +33,21 @@ BEGIN
     PUSHBUTTON      "Avslutt",IDC_SHUTDOWN,179,122,50,14
 END
 
-IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116
+IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "ReactOS-sikkerhet"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
     CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
-    LTEXT           "Hva vil du gjøre?",IDC_STATIC, 92, 60, 87, 8
-    PUSHBUTTON      "Lås datamaskinen...",IDC_LOCK, 7, 76, 74, 14
-    PUSHBUTTON      "Logg av...",IDC_LOGOFF, 86, 76, 78, 14
-    PUSHBUTTON      "Avslutt...",IDC_SHUTDOWN, 170, 76, 70, 14
-    PUSHBUTTON      "Oppgavebehandling...",IDC_TASKMGR, 86, 95, 78, 14
-    PUSHBUTTON      "Avbryt",IDCANCEL, 170, 95, 70, 14
+    GROUPBOX        "Logon Information",IDC_STATIC,7,61,261,52
+    LTEXT           "<Message>",IDC_LOGONMSG,15,73,245,18
+    LTEXT           "<Logon date>",IDC_LOGONDATE,15,94,245,8
+    CTEXT           "Hva vil du gjøre?",IDC_STATIC,10,119,255,8
+    PUSHBUTTON      "Lås datamaskinen...",IDC_LOCK, 7, 135, 74, 14
+    PUSHBUTTON      "Logg av...",IDC_LOGOFF, 86, 135, 78, 14
+    PUSHBUTTON      "Avslutt...",IDC_SHUTDOWN, 170, 135, 70, 14
+    PUSHBUTTON      "Oppgavebehandling...",IDC_TASKMGR, 86, 154, 78, 14
+    PUSHBUTTON      "Avbryt",IDCANCEL, 170, 154, 70, 14
 END
 
 IDD_LOCKED_DLG DIALOGEX 0,0,275,121
@@ -85,4 +88,5 @@ BEGIN
     IDS_ASKFORPASSWORD "Passord: "
     IDS_FORCELOGOFF "Dette vil logge av gjeldende bruker, alle ulagrede data vil gå tapt. Fortsette?"
     IDS_LOCKMSG "Only %s or an Administrator can unlock this computer."
+    IDS_LOGONDATE "Logon date: %s %s"
 END
diff --git a/reactos/dll/win32/msgina/lang/pl-PL.rc b/reactos/dll/win32/msgina/lang/pl-PL.rc
index 7bff95b333b..46e5ca5dd16 100644
--- a/reactos/dll/win32/msgina/lang/pl-PL.rc
+++ b/reactos/dll/win32/msgina/lang/pl-PL.rc
@@ -41,18 +41,21 @@ BEGIN
     PUSHBUTTON      "Wyłącz",IDC_SHUTDOWN,179,122,50,14
 END
 
-IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116
+IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Bezpieczeństwo"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
     CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
-    LTEXT           "Co chcesz teraz zrobić?",IDC_STATIC,86,60,87,8
-    PUSHBUTTON      "Blokada komputera",IDC_LOCK,10,76,70,14
-    PUSHBUTTON      "Wyloguj",IDC_LOGOFF,90,76,70,14
-    PUSHBUTTON      "Wyłącz",IDC_SHUTDOWN,170,76,70,14
-    PUSHBUTTON      "Menedżer zadań",IDC_TASKMGR,90,95,70,14
-    PUSHBUTTON      "Anuluj",IDCANCEL,170,95,70,14
+    GROUPBOX        "Logon Information",IDC_STATIC,7,61,261,52
+    LTEXT           "<Message>",IDC_LOGONMSG,15,73,245,18
+    LTEXT           "<Logon date>",IDC_LOGONDATE,15,94,245,8
+    CTEXT           "Co chcesz teraz zrobić?",IDC_STATIC,10,119,255,8
+    PUSHBUTTON      "Blokada komputera",IDC_LOCK,10,135,70,14
+    PUSHBUTTON      "Wyloguj",IDC_LOGOFF,90,135,70,14
+    PUSHBUTTON      "Wyłącz",IDC_SHUTDOWN,170,135,70,14
+    PUSHBUTTON      "Menedżer zadań",IDC_TASKMGR,90,154,70,14
+    PUSHBUTTON      "Anuluj",IDCANCEL,170,154,70,14
 END
 
 IDD_LOCKED_DLG DIALOGEX 0,0,275,121
@@ -93,4 +96,5 @@ BEGIN
     IDS_ASKFORPASSWORD "Hasło: "
     IDS_FORCELOGOFF "To wyloguje aktualnego użytkownika i straci on wszystkie niezapisane dane. Kontynuować?"
     IDS_LOCKMSG "Only %s or an Administrator can unlock this computer."
+    IDS_LOGONDATE "Logon date: %s %s"
 END
diff --git a/reactos/dll/win32/msgina/lang/ro-RO.rc b/reactos/dll/win32/msgina/lang/ro-RO.rc
index 195f7c6ca14..05ea99e5ab1 100644
--- a/reactos/dll/win32/msgina/lang/ro-RO.rc
+++ b/reactos/dll/win32/msgina/lang/ro-RO.rc
@@ -34,18 +34,21 @@ BEGIN
     PUSHBUTTON   "&Oprește",          IDC_SHUTDOWN,179,122,50,14
 END
 
-IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116
+IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Securitate"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
     CONTROL                                      IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
-    LTEXT           "Ce acțiune preferați?",     IDC_STATIC,86,60,87,8
-    PUSHBUTTON      "&Blochează calculatorul",   IDC_LOCK,10,76,70,14
-    PUSHBUTTON      "&Deautentifică-mă",         IDC_LOGOFF,90,76,70,14
-    PUSHBUTTON      "Închid&ere calculatorul",   IDC_SHUTDOWN,170,76,70,14
-    PUSHBUTTON      "Gestionar de &activități",  IDC_TASKMGR,90,95,70,14
-    PUSHBUTTON      "A&nulează",                 IDCANCEL,170,95,70,14
+    GROUPBOX        "Logon Information",IDC_STATIC,7,61,261,52
+    LTEXT           "<Message>",IDC_LOGONMSG,15,73,245,18
+    LTEXT           "<Logon date>",IDC_LOGONDATE,15,94,245,8
+    CTEXT           "Ce acțiune preferați?",     IDC_STATIC,10,119,255,8
+    PUSHBUTTON      "&Blochează calculatorul",   IDC_LOCK,10,135,70,14
+    PUSHBUTTON      "&Deautentifică-mă",         IDC_LOGOFF,90,135,70,14
+    PUSHBUTTON      "Închid&ere calculatorul",   IDC_SHUTDOWN,170,135,70,14
+    PUSHBUTTON      "Gestionar de &activități",  IDC_TASKMGR,90,154,70,14
+    PUSHBUTTON      "A&nulează",                 IDCANCEL,170,154,70,14
 END
 
 IDD_LOCKED_DLG DIALOGEX 0,0,275,121
@@ -86,4 +89,5 @@ BEGIN
     IDS_ASKFORPASSWORD      "Parolă: "
     IDS_FORCELOGOFF         "Această acțiune va deautentifica utilizatorului curent cu posibile pierderi ale datelor nepăstrate. Continuați?"
     IDS_LOCKMSG "Only %s or an Administrator can unlock this computer."
+    IDS_LOGONDATE "Logon date: %s %s"
 END
diff --git a/reactos/dll/win32/msgina/lang/ru-RU.rc b/reactos/dll/win32/msgina/lang/ru-RU.rc
index 8ed4af289c9..cc6b6ea3274 100644
--- a/reactos/dll/win32/msgina/lang/ru-RU.rc
+++ b/reactos/dll/win32/msgina/lang/ru-RU.rc
@@ -35,18 +35,21 @@ BEGIN
     PUSHBUTTON      "Выключение", IDC_SHUTDOWN, 171, 122, 58, 14
 END
 
-IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116
+IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Безопасность"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
     CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
-    LTEXT           "Выберите необходимое действие:", IDC_STATIC, 7, 60, 123, 8
-    PUSHBUTTON      "Заблокировать", IDC_LOCK, 7, 76, 86, 14
-    PUSHBUTTON      "Завершение сеанса", IDC_LOGOFF, 102, 76, 86, 14
-    PUSHBUTTON      "Выключение",IDC_SHUTDOWN, 198, 76, 70, 14
-    PUSHBUTTON      "Диспетчер задач",IDC_TASKMGR, 102, 95, 86, 14
-    PUSHBUTTON      "Отмена", IDCANCEL, 198, 95, 70, 14
+    GROUPBOX        "Logon Information",IDC_STATIC,7,61,261,52
+    LTEXT           "<Message>",IDC_LOGONMSG,15,73,245,18
+    LTEXT           "<Logon date>",IDC_LOGONDATE,15,94,245,8
+    CTEXT           "Выберите необходимое действие:", IDC_STATIC,10,119,255,8
+    PUSHBUTTON      "Заблокировать", IDC_LOCK, 7,135, 86, 14
+    PUSHBUTTON      "Завершение сеанса", IDC_LOGOFF, 102,135, 86, 14
+    PUSHBUTTON      "Выключение",IDC_SHUTDOWN, 198,135, 70, 14
+    PUSHBUTTON      "Диспетчер задач",IDC_TASKMGR, 102,154, 86, 14
+    PUSHBUTTON      "Отмена", IDCANCEL, 198,154, 70, 14
 END
 
 IDD_LOCKED_DLG DIALOGEX 0,0,275,121
@@ -87,4 +90,5 @@ BEGIN
     IDS_ASKFORPASSWORD "Пароль: "
     IDS_FORCELOGOFF "При регистрации нового пользователя все несохраненные данные будут утеряны. Продолжить?"
     IDS_LOCKMSG "Only %s or an Administrator can unlock this computer."
+    IDS_LOGONDATE "Logon date: %s %s"
 END
diff --git a/reactos/dll/win32/msgina/lang/sk-SK.rc b/reactos/dll/win32/msgina/lang/sk-SK.rc
index 8a87de2c7c4..6cff12f04e5 100644
--- a/reactos/dll/win32/msgina/lang/sk-SK.rc
+++ b/reactos/dll/win32/msgina/lang/sk-SK.rc
@@ -38,18 +38,21 @@ BEGIN
     PUSHBUTTON      "Vypnúť",IDC_SHUTDOWN,179,122,50,14
 END
 
-IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116
+IDD_LOGGEDON_DLG DIALOGEX 0,0,275,175
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Bezpečnosť"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
     CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
-    LTEXT           "Čo chcete urobiť?",IDC_STATIC,86,60,87,8
-    PUSHBUTTON      "Uzamknúť počítač",IDC_LOCK,10,76,70,14
-    PUSHBUTTON      "Odhlásiť",IDC_LOGOFF,90,76,70,14
-    PUSHBUTTON      "Vypnúť",IDC_SHUTDOWN,170,76,70,14
-    PUSHBUTTON      "Správca úloh",IDC_TASKMGR,90,95,70,14
-    PUSHBUTTON      "Zrušiť",IDCANCEL,170,95,70,14
+    GROUPBOX        "Logon Information",IDC_STATIC,7,61,261,52
+    LTEXT           "<Message>",IDC_LOGONMSG,15,73,245,18
+    LTEXT           "<Logon date>",IDC_LOGONDATE,15,94,245,8
+    CTEXT           "Čo chcete urobiť?",IDC_STATIC,10,119,255,8
+    PUSHBUTTON      "Uzamknúť počítač",IDC_LOCK,10,135,70,14
+    PUSHBUTTON      "Odhlásiť",IDC_LOGOFF,90,135,70,14
+    PUSHBUTTON      "Vypnúť",IDC_SHUTDOWN,170,135,70,14
+    PUSHBUTTON      "Správca úloh",IDC_TASKMGR,90,154,70,14
+    PUSHBUTTON      "Zrušiť",IDCANCEL,170,154,70,14
 END
 
 IDD_LOCKED_DLG DIALOGEX 0,0,275,121
@@ -90,4 +93,5 @@ BEGIN
     IDS_ASKFORPASSWORD "Heslo: "
     IDS_FORCELOGOFF "Toto spôsobí odhlásenie aktuálneho používateľa a stratu všetkých neuložených údajov. Chcete pokračovať?"
     IDS_LOCKMSG "Only %s or an Administrator can unlock this computer."
+    IDS_LOGONDATE "Logon date: %s %s"
 END
diff --git a/reactos/dll/win32/msgina/lang/uk-UA.rc b/reactos/dll/win32/msgina/lang/uk-UA.rc
index 27bd32156c3..11f1e204457 100644
--- a/reactos/dll/win32/msgina/lang/uk-UA.rc
+++ b/reactos/dll/win32/msgina/lang/uk-UA.rc
@@ -41,18 +41,21 @@ BEGIN
     PUSHBUTTON      "Завершення роботи...",IDC_SHUTDOWN,148, 122, 86, 14
 END
 
-IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116
+IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175
 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP
 CAPTION "Безпека"
 FONT 8,"MS Shell Dlg",400,0,1
 BEGIN
     CONTROL         IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54
-    LTEXT           "Що Ви хочете зробити?",IDC_STATIC, 86, 60, 87, 8
-    PUSHBUTTON      "Блокування",IDC_LOCK, 6, 76, 70, 14
-    PUSHBUTTON      "Вихід із системи...",IDC_LOGOFF, 80, 76, 80, 14
-    PUSHBUTTON      "Завершення роботи...",IDC_SHUTDOWN, 165, 76, 86, 14
-    PUSHBUTTON      "Диспетчер завдань",IDC_TASKMGR, 80, 95, 80, 14
-    PUSHBUTTON      "Скасувати",IDCANCEL, 165, 95, 86, 14
+    GROUPBOX        "Logon Information",IDC_STATIC,7,61,261,52
+    LTEXT           "<Message>",IDC_LOGONMSG,15,73,245,18
+    LTEXT           "<Logon date>",IDC_LOGONDATE,15,94,245,8
+    CTEXT           "Що Ви хочете зробити?",IDC_STATIC,10,119,255,8
+    PUSHBUTTON      "Блокування",IDC_LOCK, 6,135, 70, 14
+    PUSHBUTTON      "Вихід із системи...",IDC_LOGOFF, 80,135, 80, 14
+    PUSHBUTTON      "Завершення роботи...",IDC_SHUTDOWN, 165,135, 86, 14
+    PUSHBUTTON      "Диспетчер завдань",IDC_TASKMGR, 80,154, 80, 14
+    PUSHBUTTON      "Скасувати",IDCANCEL, 165,154, 86, 14
 END
 
 IDD_LOCKED_DLG DIALOGEX 0,0,275,121
@@ -93,4 +96,5 @@ BEGIN
     IDS_ASKFORPASSWORD "Пароль: "
     IDS_FORCELOGOFF "Це завершить сеанс поточного користувача і всі незбережені дані будуть загублені. Продовжити?"
     IDS_LOCKMSG "Only %s or an Administrator can unlock this computer."
+    IDS_LOGONDATE "Logon date: %s %s"
 END
diff --git a/reactos/dll/win32/msgina/msgina.c b/reactos/dll/win32/msgina/msgina.c
index 2c2e9ed05b7..19ec8a1d83d 100644
--- a/reactos/dll/win32/msgina/msgina.c
+++ b/reactos/dll/win32/msgina/msgina.c
@@ -428,6 +428,9 @@ DoLoginTasks(
 		goto cleanup;
 	}
 
+	/* Store the logon time in the context */
+	GetLocalTime(&pgContext->LogonTime);
+
 	/* Store user and domain in the context */
 	wcscpy(pgContext->UserName, UserName);
 	if (Domain == NULL || wcslen(Domain) == 0)
diff --git a/reactos/dll/win32/msgina/msgina.h b/reactos/dll/win32/msgina/msgina.h
index b4fe73b0775..24332ced9b9 100644
--- a/reactos/dll/win32/msgina/msgina.h
+++ b/reactos/dll/win32/msgina/msgina.h
@@ -6,6 +6,7 @@
 #include <wincon.h>
 #include <winreg.h>
 #include <wingdi.h>
+#include <winnls.h>
 #include <winsvc.h>
 #include <winuser.h>
 #include <userenv.h>
@@ -31,6 +32,7 @@ typedef struct
 	/* Informations to be filled during logon */
 	WCHAR UserName[256];
 	WCHAR Domain[256];
+	SYSTEMTIME LogonTime;
 	HANDLE UserToken;
 	PLUID pAuthenticationId;
 	PDWORD pdwOptions;
diff --git a/reactos/dll/win32/msgina/resource.h b/reactos/dll/win32/msgina/resource.h
index 45c200c1b63..ef06d5b2173 100644
--- a/reactos/dll/win32/msgina/resource.h
+++ b/reactos/dll/win32/msgina/resource.h
@@ -17,6 +17,8 @@
 #define IDC_ROSLOGO                     1007
 #define IDC_TASKMGR                     1008
 #define IDC_LOCKMSG                     1009
+#define IDC_LOGONMSG                    1010
+#define IDC_LOGONDATE                   1011
 
 #define IDI_ROSLOGO                     20000
 
@@ -29,5 +31,7 @@
 #define IDS_ASKFORPASSWORD              40004
 #define IDS_FORCELOGOFF                 40005
 #define IDS_LOCKMSG                     40006
+#define IDS_LOGONMSG                    40007
+#define IDS_LOGONDATE                   40008
 
 /* EOF */