diff --git a/src/sbbs3/ctrl/MailCfgDlgUnit.dfm b/src/sbbs3/ctrl/MailCfgDlgUnit.dfm
index a835364c811833ac4cf2b29417d7900263d7cba6..e2fa5e3f2274d8f2c6304f5676545347aaaefdac 100644
--- a/src/sbbs3/ctrl/MailCfgDlgUnit.dfm
+++ b/src/sbbs3/ctrl/MailCfgDlgUnit.dfm
@@ -53,8 +53,8 @@ object MailCfgDlg: TMailCfgDlg
     Top = 3
     Width = 278
     Height = 199
-    ActivePage = SMTPTabSheet
-    TabIndex = 1
+    ActivePage = POP3TabSheet
+    TabIndex = 2
     TabOrder = 3
     object GeneralTabSheet: TTabSheet
       Caption = 'General'
@@ -165,7 +165,7 @@ object MailCfgDlg: TMailCfgDlg
         Caption = 'Log Transmissions'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 6
+        TabOrder = 7
       end
       object LogFileCheckBox: TCheckBox
         Left = 150
@@ -176,7 +176,7 @@ object MailCfgDlg: TMailCfgDlg
         Caption = 'Log to Disk'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 9
+        TabOrder = 10
       end
       object LinesPerYieldEdit: TEdit
         Left = 92
@@ -188,7 +188,7 @@ object MailCfgDlg: TMailCfgDlg
           ' yields'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 5
+        TabOrder = 6
       end
       object DebugRXCheckBox: TCheckBox
         Left = 150
@@ -199,7 +199,7 @@ object MailCfgDlg: TMailCfgDlg
         Caption = 'Log Responses'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 7
+        TabOrder = 8
       end
       object DebugHeadersCheckBox: TCheckBox
         Left = 150
@@ -210,7 +210,7 @@ object MailCfgDlg: TMailCfgDlg
         Caption = 'Log RX Headers'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 8
+        TabOrder = 9
       end
       object MaxMsgsWaitingEdit: TEdit
         Left = 92
@@ -220,7 +220,7 @@ object MailCfgDlg: TMailCfgDlg
         Hint = 'Maximum number of messages waiting per user (0=unlimited)'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 10
+        TabOrder = 5
       end
     end
     object SMTPTabSheet: TTabSheet
@@ -294,7 +294,7 @@ object MailCfgDlg: TMailCfgDlg
           'ysop")'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 6
+        TabOrder = 8
       end
       object MaxRecipientsEdit: TEdit
         Left = 241
@@ -304,7 +304,7 @@ object MailCfgDlg: TMailCfgDlg
         Hint = 'Maximum number of recipients for a single message'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 5
+        TabOrder = 7
       end
       object MaxMsgSizeEdit: TEdit
         Left = 92
@@ -314,7 +314,7 @@ object MailCfgDlg: TMailCfgDlg
         Hint = 'Maximum received message size (in bytes)'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 4
+        TabOrder = 6
       end
       object AuthViaIpCheckBox: TCheckBox
         Left = 7
@@ -327,7 +327,7 @@ object MailCfgDlg: TMailCfgDlg
         Caption = 'Allow Authentication via POP3, Telnet, etc.'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 7
+        TabOrder = 9
       end
       object NotifyCheckBox: TCheckBox
         Left = 150
@@ -348,7 +348,7 @@ object MailCfgDlg: TMailCfgDlg
         Hint = 'TCP port number for incoming SMTP submissions (default=587)'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 2
+        TabOrder = 4
       end
       object UseSubPortCheckBox: TCheckBox
         Left = 150
@@ -357,7 +357,7 @@ object MailCfgDlg: TMailCfgDlg
         Height = 19
         Hint = 'Enable the SMTP submission port'
         Caption = 'Enabled'
-        TabOrder = 3
+        TabOrder = 5
         OnClick = UseSubPortCheckBoxClick
       end
       object TLSSubPortEdit: TEdit
@@ -368,7 +368,7 @@ object MailCfgDlg: TMailCfgDlg
         Hint = 'TCP port number for incoming SMTP/TLS submissions'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 8
+        TabOrder = 2
       end
       object TLSSubPortCheckBox: TCheckBox
         Left = 150
@@ -377,7 +377,7 @@ object MailCfgDlg: TMailCfgDlg
         Height = 19
         Hint = 'Enable the SMTP/TLS submission port'
         Caption = 'Enabled'
-        TabOrder = 9
+        TabOrder = 3
         OnClick = TLSSubPortCheckBoxClick
       end
     end
@@ -419,7 +419,7 @@ object MailCfgDlg: TMailCfgDlg
         Caption = 'Log'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 1
+        TabOrder = 4
       end
       object POP3EnabledCheckBox: TCheckBox
         Left = 150
@@ -430,7 +430,7 @@ object MailCfgDlg: TMailCfgDlg
         Caption = 'Enabled'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 2
+        TabOrder = 1
         OnClick = POP3EnabledCheckBoxClick
       end
       object TLSPOP3PortEdit: TEdit
@@ -441,7 +441,7 @@ object MailCfgDlg: TMailCfgDlg
         Hint = 'TCP port number for incoming POP3S connections'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 3
+        TabOrder = 2
       end
       object TLSPOP3EnabledCheckBox: TCheckBox
         Left = 150
@@ -452,7 +452,7 @@ object MailCfgDlg: TMailCfgDlg
         Caption = 'Enabled'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 4
+        TabOrder = 3
         OnClick = POP3EnabledCheckBoxClick
       end
     end
diff --git a/src/sbbs3/ctrl/TelnetCfgDlgUnit.dfm b/src/sbbs3/ctrl/TelnetCfgDlgUnit.dfm
index 626fed82d5c13dba18162ac27e72718b9481b946..6745e78e5af96f170a1496d2301750152dab7575 100644
--- a/src/sbbs3/ctrl/TelnetCfgDlgUnit.dfm
+++ b/src/sbbs3/ctrl/TelnetCfgDlgUnit.dfm
@@ -17,8 +17,8 @@ object TelnetCfgDlg: TTelnetCfgDlg
     Top = 3
     Width = 278
     Height = 186
-    ActivePage = SshTabSheet
-    TabIndex = 3
+    ActivePage = GeneralTabSheet
+    TabIndex = 0
     TabOrder = 0
     object GeneralTabSheet: TTabSheet
       Caption = 'General'
@@ -55,7 +55,7 @@ object TelnetCfgDlg: TTelnetCfgDlg
         Caption = 'Auto Startup'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 3
+        TabOrder = 4
       end
       object FirstNodeEdit: TEdit
         Left = 85
@@ -76,7 +76,7 @@ object TelnetCfgDlg: TTelnetCfgDlg
         Caption = 'Minimize Externals'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 4
+        TabOrder = 5
       end
       object LastNodeEdit: TEdit
         Left = 85
@@ -97,7 +97,7 @@ object TelnetCfgDlg: TTelnetCfgDlg
         Caption = 'Hostname Lookup'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 2
+        TabOrder = 3
       end
       object QWKEventsCheckBox: TCheckBox
         Left = 148
@@ -108,7 +108,7 @@ object TelnetCfgDlg: TTelnetCfgDlg
         Caption = 'QWK Msg Events'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 6
+        TabOrder = 7
       end
       object JavaScriptCheckBox: TCheckBox
         Left = 148
@@ -119,7 +119,7 @@ object TelnetCfgDlg: TTelnetCfgDlg
         Caption = 'JavaScript Support'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 7
+        TabOrder = 8
       end
       object EventsCheckBox: TCheckBox
         Left = 148
@@ -130,7 +130,7 @@ object TelnetCfgDlg: TTelnetCfgDlg
         Caption = 'Events Enabled'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 5
+        TabOrder = 6
       end
       object DosSupportCheckBox: TCheckBox
         Left = 7
@@ -141,7 +141,7 @@ object TelnetCfgDlg: TTelnetCfgDlg
         Caption = 'DOS Program Support'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 8
+        TabOrder = 9
       end
       object IdentityCheckBox: TCheckBox
         Left = 7
@@ -152,7 +152,7 @@ object TelnetCfgDlg: TTelnetCfgDlg
         Caption = 'Identity Lookup'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 9
+        TabOrder = 10
       end
       object MaxConConEdit: TEdit
         Left = 85
@@ -164,7 +164,7 @@ object TelnetCfgDlg: TTelnetCfgDlg
           'nlimited)'
         ParentShowHint = False
         ShowHint = True
-        TabOrder = 10
+        TabOrder = 2
       end
     end
     object TelnetTabSheet: TTabSheet