diff --git a/openvpn.c b/openvpn.c
index a78741d..3bdb97a 100644
--- a/openvpn.c
+++ b/openvpn.c
@@ -856,6 +856,7 @@ GenericPassDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
             if (param->flags & FLAG_CR_TYPE_CRV1 || param->flags & FLAG_CR_TYPE_CRTEXT)
             {
                 SetDlgItemTextW(hwndDlg, ID_TXT_DESCRIPTION, wstr);
+                SetDlgItemTextW(hwndDlg, ID_TXT_WARNING, NULL);
 
                 /* Set password echo on if needed */
                 if (param->flags & FLAG_CR_ECHO)
@@ -898,12 +899,12 @@ GenericPassDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
                 {
                     if (RecallSmartCardPin(param->c->config_name, password))
                     {
-                        SetDlgItemTextW(hwndDlg, ID_EDT_RESPONSE, password);
-                        Button_SetCheck(GetDlgItem(hwndDlg, ID_CHK_SAVE_PASS), BST_CHECKED);
-                        lenableOKBtn = TRUE;
-
                         if (password[0] != L'\0' && param->c->failed_auth_attempts == 0)
                         {
+                            SetDlgItemTextW(hwndDlg, ID_EDT_RESPONSE, password);
+                            Button_SetCheck(GetDlgItem(hwndDlg, ID_CHK_SAVE_PASS), BST_CHECKED);
+                            lenableOKBtn = TRUE;
+
                             /* smart card pin available: skip dialog
                             * if silent_connection is on, else auto submit after a few seconds.
                             * User can interrupt.
@@ -911,11 +912,14 @@ GenericPassDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
                             SetFocus(GetDlgItem(hwndDlg, IDOK));
                             UINT timeout = o.silent_connection ? 0 : 6; /* in seconds */
                             AutoCloseSetup(hwndDlg, IDOK, timeout, ID_TXT_WARNING, IDS_NFO_AUTO_CONNECT);
-                        }
-                        else if (param->c->failed_auth_attempts)
+                        } 
+                        else if (param->c->failed_auth_attempts > 0)
                         {
                             SendMessage(
                                 GetDlgItem(hwndDlg, ID_EDT_RESPONSE), EM_SETSEL, 0, MAKELONG(0, -1));
+
+                            SetDlgItemTextW(
+                                hwndDlg, ID_TXT_WARNING, LoadLocalizedString(IDS_NFO_KEY_PASS_RETRY));
                         }
 
                         SecureZeroMemory(password, sizeof(password));
diff --git a/res/openvpn-gui-res-cs.rc b/res/openvpn-gui-res-cs.rc
index faef7f7..edda5fd 100644
--- a/res/openvpn-gui-res-cs.rc
+++ b/res/openvpn-gui-res-cs.rc
@@ -78,7 +78,7 @@ BEGIN
 END
 
 /* Challenge Response Dialog */
-ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 90
+ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 106
 STYLE WS_SIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN - Odpověď na výzvu"
@@ -92,6 +92,7 @@ BEGIN
     CHECKBOX "Uložit heslo", ID_CHK_SAVE_PASS, 60, 45, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 65, 50, 14, BS_PUSHBUTTON | WS_TABSTOP
     PUSHBUTTON "Zrušit", IDCANCEL, 90, 65, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 86, 400, 10
 END
 
 /* Status Dialog */
diff --git a/res/openvpn-gui-res-de.rc b/res/openvpn-gui-res-de.rc
index 205bf71..d18527f 100644
--- a/res/openvpn-gui-res-de.rc
+++ b/res/openvpn-gui-res-de.rc
@@ -78,7 +78,7 @@ BEGIN
 END
 
 /* Challenge Response Dialog */
-ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 90
+ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 106
 STYLE WS_SIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN – Challenge Response"
@@ -92,6 +92,7 @@ BEGIN
     CHECKBOX "Passwort &speichern", ID_CHK_SAVE_PASS, 60, 45, 100, 10
     PUSHBUTTON "&OK", IDOK, 20, 65, 50, 14, BS_PUSHBUTTON | WS_TABSTOP
     PUSHBUTTON "&Abbrechen", IDCANCEL, 90, 65, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 86, 400, 10
 END
 
 /* Status Dialog */
diff --git a/res/openvpn-gui-res-dk.rc b/res/openvpn-gui-res-dk.rc
index 8e9f07e..9b6b0a2 100644
--- a/res/openvpn-gui-res-dk.rc
+++ b/res/openvpn-gui-res-dk.rc
@@ -79,7 +79,7 @@ BEGIN
 END
 
 /* Challenge Response Dialog */
-ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 90
+ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 106
 STYLE WS_SIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN - Challenge Response"
@@ -93,6 +93,7 @@ BEGIN
     CHECKBOX "Husk kodeord", ID_CHK_SAVE_PASS, 60, 45, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 65, 50, 14, BS_PUSHBUTTON | WS_TABSTOP
     PUSHBUTTON "Annuller", IDCANCEL, 90, 65, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 86, 400, 10
 END
 
 /* Status Dialog */
diff --git a/res/openvpn-gui-res-en.rc b/res/openvpn-gui-res-en.rc
index 0da5726..ec784fd 100644
--- a/res/openvpn-gui-res-en.rc
+++ b/res/openvpn-gui-res-en.rc
@@ -78,7 +78,7 @@ BEGIN
 END
 
 /* Challenge Response Dialog */
-ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 90
+ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 106
 STYLE WS_SIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN – Challenge Response"
@@ -92,6 +92,7 @@ BEGIN
     CHECKBOX "Save", ID_CHK_SAVE_PASS, 60, 45, 100, 10
     PUSHBUTTON "&OK", IDOK, 20, 65, 50, 14, BS_PUSHBUTTON | WS_TABSTOP
     PUSHBUTTON "&Cancel", IDCANCEL, 90, 65, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 86, 400, 10
 END
 
 /* Status Dialog */
diff --git a/res/openvpn-gui-res-es.rc b/res/openvpn-gui-res-es.rc
index 6303ac1..c0159a0 100644
--- a/res/openvpn-gui-res-es.rc
+++ b/res/openvpn-gui-res-es.rc
@@ -77,7 +77,7 @@ BEGIN
 END
 
 /* Challenge Response Dialog */
-ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 90
+ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 106
 STYLE WS_SIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN - Challenge Response"
@@ -91,6 +91,7 @@ BEGIN
     CHECKBOX "Save", ID_CHK_SAVE_PASS, 60, 45, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 65, 50, 14, BS_PUSHBUTTON | WS_TABSTOP
     PUSHBUTTON "Cancelar", IDCANCEL, 90, 65, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 86, 400, 10
 END
 
 /* Status Dialog */
diff --git a/res/openvpn-gui-res-fa.rc b/res/openvpn-gui-res-fa.rc
index 056094b..4e88021 100644
--- a/res/openvpn-gui-res-fa.rc
+++ b/res/openvpn-gui-res-fa.rc
@@ -80,7 +80,7 @@ BEGIN
 END
 
 /* Challenge Response Dialog */
-ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 90
+ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 106
 STYLE WS_SIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST | WS_EX_RTLREADING | WS_EX_LAYOUTRTL
 CAPTION "OpenVPN – پاسخ چالش"
@@ -94,6 +94,7 @@ BEGIN
     CHECKBOX "نگه داشتن رمز عبور", ID_CHK_SAVE_PASS, 60, 45, 100, 10
     PUSHBUTTON "بسیار خوب", IDOK, 20, 65, 50, 14, BS_PUSHBUTTON | WS_TABSTOP
     PUSHBUTTON "لغو", IDCANCEL, 90, 65, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 86, 400, 10
 END
 
 /* Status Dialog */
diff --git a/res/openvpn-gui-res-fi.rc b/res/openvpn-gui-res-fi.rc
index 5d33946..7677d8c 100644
--- a/res/openvpn-gui-res-fi.rc
+++ b/res/openvpn-gui-res-fi.rc
@@ -78,7 +78,7 @@ BEGIN
 END
 
 /* Challenge Response Dialog */
-ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 90
+ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 106
 STYLE WS_SIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN - Haastemenetelmä"
@@ -92,6 +92,7 @@ BEGIN
     CHECKBOX "Tallenna salasana", ID_CHK_SAVE_PASS, 60, 45, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 65, 50, 14, BS_PUSHBUTTON | WS_TABSTOP
     PUSHBUTTON "Peruuta", IDCANCEL, 90, 65, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 86, 400, 10
 END
 
 /* Status Dialog */
diff --git a/res/openvpn-gui-res-fr.rc b/res/openvpn-gui-res-fr.rc
index d903175..ae18025 100644
--- a/res/openvpn-gui-res-fr.rc
+++ b/res/openvpn-gui-res-fr.rc
@@ -77,7 +77,7 @@ BEGIN
 END
 
 /* Challenge Response Dialog */
-ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 90
+ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 106
 STYLE WS_SIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN - Réponse de défi"
@@ -91,6 +91,7 @@ BEGIN
     CHECKBOX "Enregistrer mot de passe", ID_CHK_SAVE_PASS, 60, 45, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 65, 50, 14, BS_PUSHBUTTON | WS_TABSTOP
     PUSHBUTTON "Annuler", IDCANCEL, 90, 65, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 86, 400, 10
 END
 
 /* Status Dialog */
diff --git a/res/openvpn-gui-res-it.rc b/res/openvpn-gui-res-it.rc
index f8fa300..c86f17c 100644
--- a/res/openvpn-gui-res-it.rc
+++ b/res/openvpn-gui-res-it.rc
@@ -77,7 +77,7 @@ BEGIN
 END
 
 /* Challenge Response Dialog */
-ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 90
+ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 106
 STYLE WS_SIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN - Challenge Response"
@@ -91,6 +91,7 @@ BEGIN
     CHECKBOX "&Ricorda password", ID_CHK_SAVE_PASS, 60, 45, 100, 10
     PUSHBUTTON "&OK", IDOK, 20, 65, 50, 14, BS_PUSHBUTTON | WS_TABSTOP
     PUSHBUTTON "&Annulla", IDCANCEL, 90, 65, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 86, 400, 10
 END
 
 /* Status Dialog */
diff --git a/res/openvpn-gui-res-jp.rc b/res/openvpn-gui-res-jp.rc
index 69ff8ba..56ba08d 100644
--- a/res/openvpn-gui-res-jp.rc
+++ b/res/openvpn-gui-res-jp.rc
@@ -79,7 +79,7 @@ BEGIN
     LTEXT "", ID_TXT_WARNING, 6, 108, 150, 10
 END
 /* Challenge Response Dialog */
-ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 90
+ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 106
 STYLE WS_SIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN - チャレンジ/レスポンス"
@@ -93,6 +93,7 @@ BEGIN
     CHECKBOX "パスワードを保存(&S)", ID_CHK_SAVE_PASS, 60, 45, 100, 10
     PUSHBUTTON "OK(&O)", IDOK, 20, 65, 50, 14, BS_PUSHBUTTON | WS_TABSTOP
     PUSHBUTTON "キャンセル(&C)", IDCANCEL, 90, 65, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 86, 400, 10
 END
 
 /* Status Dialog */
diff --git a/res/openvpn-gui-res-kr.rc b/res/openvpn-gui-res-kr.rc
index 5c9c33f..85c9d85 100644
--- a/res/openvpn-gui-res-kr.rc
+++ b/res/openvpn-gui-res-kr.rc
@@ -79,7 +79,7 @@ BEGIN
 END
 
 /* Challenge Response Dialog */
-ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 90
+ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 106
 STYLE WS_SIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN - 자격증명"
@@ -93,6 +93,7 @@ BEGIN
     CHECKBOX "암호 저장", ID_CHK_SAVE_PASS, 60, 45, 100, 10
     PUSHBUTTON "확인", IDOK, 25, 65, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED
     PUSHBUTTON "취소", IDCANCEL, 85, 65, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 86, 400, 10
 END
 
 /* Status Dialog */
diff --git a/res/openvpn-gui-res-nl.rc b/res/openvpn-gui-res-nl.rc
index 71077a9..5c7bd6c 100644
--- a/res/openvpn-gui-res-nl.rc
+++ b/res/openvpn-gui-res-nl.rc
@@ -77,7 +77,7 @@ BEGIN
 END
 
 /* Challenge Response Dialog */
-ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 90
+ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 106
 STYLE WS_SIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN - Challenge Response"
@@ -91,6 +91,7 @@ BEGIN
     CHECKBOX "Wachtwoord opslaan", ID_CHK_SAVE_PASS, 60, 45, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 65, 50, 14, BS_PUSHBUTTON | WS_TABSTOP
     PUSHBUTTON "Annuleren", IDCANCEL, 90, 65, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 86, 400, 10
 END
 
 /* Status Dialog */
diff --git a/res/openvpn-gui-res-no.rc b/res/openvpn-gui-res-no.rc
index 338e5a5..f5af47d 100644
--- a/res/openvpn-gui-res-no.rc
+++ b/res/openvpn-gui-res-no.rc
@@ -78,7 +78,7 @@ BEGIN
 END
 
 /* Challenge Response Dialog */
-ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 90
+ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 106
 STYLE WS_SIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN - Challenge Response"
@@ -92,6 +92,7 @@ BEGIN
     CHECKBOX "Husk passord", ID_CHK_SAVE_PASS, 60, 45, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 65, 50, 14, BS_PUSHBUTTON | WS_TABSTOP
     PUSHBUTTON "Avbryt", IDCANCEL, 90, 65, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 86, 400, 10
 END
 
 /* Status Dialog */
diff --git a/res/openvpn-gui-res-pl.rc b/res/openvpn-gui-res-pl.rc
index f806131..d8c7bec 100644
--- a/res/openvpn-gui-res-pl.rc
+++ b/res/openvpn-gui-res-pl.rc
@@ -79,7 +79,7 @@ BEGIN
 END
 
 /* Challenge Response Dialog */
-ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 90
+ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 106
 STYLE WS_SIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN - Odpowiedź"
@@ -93,6 +93,7 @@ BEGIN
     CHECKBOX "Zapisz hasło", ID_CHK_SAVE_PASS, 60, 45, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 65, 50, 14, BS_PUSHBUTTON | WS_TABSTOP
     PUSHBUTTON "Anuluj", IDCANCEL, 90, 65, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 86, 400, 10
 END
 
 /* Status Dialog */
diff --git a/res/openvpn-gui-res-pt.rc b/res/openvpn-gui-res-pt.rc
index 3e57a57..7d0742e 100644
--- a/res/openvpn-gui-res-pt.rc
+++ b/res/openvpn-gui-res-pt.rc
@@ -77,7 +77,7 @@ BEGIN
 END
 
 /* Challenge Response Dialog */
-ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 90
+ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 106
 STYLE WS_SIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN - Resposta do Desafio"
@@ -91,6 +91,7 @@ BEGIN
     CHECKBOX "Salvar senha", ID_CHK_SAVE_PASS, 60, 45, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 65, 50, 14, BS_PUSHBUTTON | WS_TABSTOP
     PUSHBUTTON "Cancelar", IDCANCEL, 90, 65, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 86, 400, 10
 END
 
 /* Status Dialog */
diff --git a/res/openvpn-gui-res-ru.rc b/res/openvpn-gui-res-ru.rc
index b86bcc1..3ca2be8 100644
--- a/res/openvpn-gui-res-ru.rc
+++ b/res/openvpn-gui-res-ru.rc
@@ -79,7 +79,7 @@ BEGIN
 END
 
 /* Challenge Response Dialog */
-ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 90
+ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 106
 STYLE WS_SIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN – Challenge Response"
@@ -93,6 +93,7 @@ BEGIN
     CHECKBOX "Запомнить", ID_CHK_SAVE_PASS, 60, 45, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 65, 50, 14, BS_PUSHBUTTON | WS_TABSTOP
     PUSHBUTTON "Отмена", IDCANCEL, 90, 65, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 86, 400, 10
 END
 
 /* Status Dialog */
diff --git a/res/openvpn-gui-res-se.rc b/res/openvpn-gui-res-se.rc
index a0e1fa6..970a726 100644
--- a/res/openvpn-gui-res-se.rc
+++ b/res/openvpn-gui-res-se.rc
@@ -77,7 +77,7 @@ BEGIN
 END
 
 /* Challenge Response Dialog */
-ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 90
+ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 106
 STYLE WS_SIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN - Challenge Response"
@@ -91,6 +91,7 @@ BEGIN
     CHECKBOX "Save", ID_CHK_SAVE_PASS, 60, 45, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 65, 50, 14, BS_PUSHBUTTON | WS_TABSTOP
     PUSHBUTTON "Avbryt", IDCANCEL, 90, 65, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 86, 400, 10
 END
 
 /* Status Dialog */
diff --git a/res/openvpn-gui-res-tr.rc b/res/openvpn-gui-res-tr.rc
index 4e6a5a2..3fa23e2 100644
--- a/res/openvpn-gui-res-tr.rc
+++ b/res/openvpn-gui-res-tr.rc
@@ -79,7 +79,7 @@ BEGIN
 END
 
 /* Challenge Response Dialog */
-ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 90
+ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 106
 STYLE WS_SIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN - Challenge Response"
@@ -93,6 +93,7 @@ BEGIN
     CHECKBOX "Save", ID_CHK_SAVE_PASS, 60, 45, 100, 10
     PUSHBUTTON "Tamam", IDOK, 20, 65, 50, 14, BS_PUSHBUTTON | WS_TABSTOP
     PUSHBUTTON "Çıkış", IDCANCEL, 90, 65, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 86, 400, 10
 END
 
 /* Status Dialog */
diff --git a/res/openvpn-gui-res-ua.rc b/res/openvpn-gui-res-ua.rc
index 308491a..8702203 100644
--- a/res/openvpn-gui-res-ua.rc
+++ b/res/openvpn-gui-res-ua.rc
@@ -77,7 +77,7 @@ BEGIN
 END
 
 /* Challenge Response Dialog */
-ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 90
+ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 106
 STYLE WS_SIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN - Challenge Response"
@@ -91,6 +91,7 @@ BEGIN
     CHECKBOX "Запам'ятати", ID_CHK_SAVE_PASS, 60, 45, 100, 10
     PUSHBUTTON "OK", IDOK, 20, 65, 50, 14, BS_PUSHBUTTON | WS_TABSTOP
     PUSHBUTTON "Скасувати", IDCANCEL, 90, 65, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 86, 400, 10
 END
 
 /* Status Dialog */
diff --git a/res/openvpn-gui-res-zh-hans.rc b/res/openvpn-gui-res-zh-hans.rc
index 23385b5..1dc5699 100644
--- a/res/openvpn-gui-res-zh-hans.rc
+++ b/res/openvpn-gui-res-zh-hans.rc
@@ -80,7 +80,7 @@ BEGIN
 END
 
 /* Challenge Response Dialog */
-ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 90
+ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 106
 STYLE WS_SIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN - 质询响应"
@@ -94,6 +94,7 @@ BEGIN
     CHECKBOX "保存密码", ID_CHK_SAVE_PASS, 60, 45, 100, 10
     PUSHBUTTON "确定", IDOK, 20, 65, 50, 14, BS_PUSHBUTTON | WS_TABSTOP
     PUSHBUTTON "取消", IDCANCEL, 90, 65, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 86, 400, 10
 END
 
 /* Status Dialog */
diff --git a/res/openvpn-gui-res-zh-hant.rc b/res/openvpn-gui-res-zh-hant.rc
index c93f935..06283e0 100644
--- a/res/openvpn-gui-res-zh-hant.rc
+++ b/res/openvpn-gui-res-zh-hant.rc
@@ -80,7 +80,7 @@ BEGIN
 END
 
 /* Challenge Response Dialog */
-ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 90
+ID_DLG_CHALLENGE_RESPONSE DIALOGEX 6, 18, 212, 106
 STYLE WS_SIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | DS_CENTER | DS_SETFOREGROUND
 EXSTYLE WS_EX_TOPMOST
 CAPTION "OpenVPN - 挑戰回應"
@@ -94,6 +94,7 @@ BEGIN
     CHECKBOX "儲存密碼", ID_CHK_SAVE_PASS, 60, 45, 100, 10
     PUSHBUTTON "確認", IDOK, 20, 65, 50, 14, BS_PUSHBUTTON | WS_TABSTOP
     PUSHBUTTON "取消", IDCANCEL, 90, 65, 52, 14
+    LTEXT "", ID_TXT_WARNING, 6, 86, 400, 10
 END
 
 /* Status Dialog */