diff --git a/src/sbbs3/ctrl/ConfigWizardUnit.cpp b/src/sbbs3/ctrl/ConfigWizardUnit.cpp
index 7373711e98c86dc730d6d488faf8e869a96685ff..0d516872bd0629dd6c399fc11b83b377e80e579d 100644
--- a/src/sbbs3/ctrl/ConfigWizardUnit.cpp
+++ b/src/sbbs3/ctrl/ConfigWizardUnit.cpp
@@ -137,6 +137,7 @@ void __fastcall TConfigWizard::FormShow(TObject *Sender)
         Close();
         return;
     }
+	SysPass = scfg.sys_pass;
 
     if(scfg.new_install) {
         TIME_ZONE_INFORMATION tz;
@@ -229,15 +230,18 @@ void __fastcall TConfigWizard::FormShow(TObject *Sender)
             SAFECOPY(str,tz_str[i]);
         TimeZoneComboBox->Items->Add(str);
     }
-   	sprintf(str,"Other (%s)",smb_zonestr(scfg.sys_timezone,NULL));
+	if(scfg.sys_timezone == SYS_TIMEZONE_AUTO)
+		snprintf(str, sizeof str, "Automatic (%s)", smb_zonestr(sys_timezone(&scfg), NULL));
+	else
+		snprintf(str, sizeof str, "Other (%s)",smb_zonestr(scfg.sys_timezone,NULL));
     TimeZoneComboBox->Items->Add(str);
 
     for(i=0;i<sizeof(tz_val)/sizeof(tz_val[0]);i++)
         if((scfg.sys_timezone&((short)~DAYLIGHT))==tz_val[i])
             break;
     TimeZoneComboBox->ItemIndex=i;
-    DaylightCheckBox->Enabled=scfg.sys_timezone&US_ZONE;
-    DaylightCheckBox->Checked=scfg.sys_timezone&DAYLIGHT;
+    DaylightCheckBox->Enabled = SMB_TZ_HAS_DST(scfg.sys_timezone);
+    DaylightCheckBox->Checked = DaylightCheckBox->Enabled && (scfg.sys_timezone & DAYLIGHT);
     if(scfg.sys_misc&SM_MILITARY)
         Time24hrRadioButton->Checked=true;
     else
@@ -314,8 +318,22 @@ void __fastcall TConfigWizard::NextButtonClick(TObject *Sender)
         if(!save_cfg(&scfg)) {
         	Application->MessageBox("Error saving configuration"
             	,"ERROR",MB_OK|MB_ICONEXCLAMATION);
-        } else
+        } else {
+			if(strcmp(scfg.sys_pass, SysPass.c_str()) != 0) {
+				char path[MAX_PATH + 1];
+				snprintf(path, sizeof path, "%scryptlib.key", scfg.ctrl_dir);
+				if(fexist(path) && remove(path) != 0)
+					Application->MessageBox(path, "ERROR Removing File"
+						,MB_OK|MB_ICONEXCLAMATION);
+				else {
+					snprintf(path, sizeof path, "%sssl.cert", scfg.ctrl_dir);
+					if(fexist(path) && remove(path) != 0)
+						Application->MessageBox(path, "ERROR Removing File"
+							,MB_OK|MB_ICONEXCLAMATION);
+				}
+			}
         	refresh_cfg(&scfg);
+		}
         Close();
         return;
     }
diff --git a/src/sbbs3/ctrl/ConfigWizardUnit.h b/src/sbbs3/ctrl/ConfigWizardUnit.h
index 229f5dbe5cb914671d39a3a06fa26bd9e6b1f4a2..a7d107286afe00f79c27b4b929fce28d0e8ed1fa 100644
--- a/src/sbbs3/ctrl/ConfigWizardUnit.h
+++ b/src/sbbs3/ctrl/ConfigWizardUnit.h
@@ -101,6 +101,7 @@ __published:	// IDE-managed Components
     void __fastcall NewUsersCheckBoxClick(TObject *Sender);
 private:	// User declarations
     scfg_t  scfg;
+	AnsiString SysPass;
 public:		// User declarations
     __fastcall TConfigWizard(TComponent* Owner);
 };