2 files changed, 4 insertions, 2 deletions
diff --git a/main.cpp b/main.cpp
index 5c98c2c..d49d38d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -356,6 +356,7 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
 		TranslateDialogDefault(hwndDlg);
 		ComboBoxAddStringUtf(GetDlgItem(hwndDlg, IDC_KEY_TYPE), _T("RSA"), 0);
 		ComboBoxAddStringUtf(GetDlgItem(hwndDlg, IDC_KEY_TYPE), _T("DSA"), 1);
+		SendDlgItemMessage(hwndDlg, IDC_KEY_TYPE, CB_SETCURSEL, (WPARAM)1, 0);
 		SetDlgItemInt(hwndDlg, IDC_KEY_EXPIRE_DATE, 0, 0);
 		SetDlgItemInt(hwndDlg, IDC_KEY_LENGTH, 2048, 0);
       return TRUE;
diff --git a/new_gpg.rc b/new_gpg.rc
index cccdf05..18a593d 100644
--- a/new_gpg.rc
+++ b/new_gpg.rc
@@ -122,10 +122,11 @@ BEGIN
     EDITTEXT        IDC_KEY_REAL_NAME,65,61,55,14,ES_AUTOHSCROLL
     EDITTEXT        IDC_KEY_COMMENT,65,91,55,14,ES_AUTOHSCROLL
     EDITTEXT        IDC_KEY_EXPIRE_DATE,65,106,55,14,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "ex.: 2010-08-15 or 0",IDC_STATIC,127,108,68,8
+    LTEXT           "ex.: 2010-08-15",IDC_STATIC,127,108,54,8
     EDITTEXT        IDC_KEY_LENGTH,65,30,40,14,ES_AUTOHSCROLL | ES_NUMBER
     LTEXT           "From 1024 to 4096",IDC_STATIC,113,33,62,8
-    LTEXT           "It can take long time, have patience",IDC_STATIC,15,130,164,8
+    LTEXT           "It can take a long time, be patient",IDC_STATIC,15,132,164,8
+    LTEXT           "0 - does not expire",IDC_STATIC,67,122,62,8
 END
 
 IDD_LOAD_EXISTING_KEY DIALOGEX 0, 0, 316, 156