diff --git a/src/sbbs3/ctrl/MailCfgDlgUnit.cpp b/src/sbbs3/ctrl/MailCfgDlgUnit.cpp
index 892f5cd425ae4dbd1b943f90bed955e46aa000ea..c3cc61eba87751a8f8effef22f2df0f29eb72898 100644
--- a/src/sbbs3/ctrl/MailCfgDlgUnit.cpp
+++ b/src/sbbs3/ctrl/MailCfgDlgUnit.cpp
@@ -172,6 +172,9 @@ void __fastcall TMailCfgDlg::FormShow(TObject *Sender)
         =(MainForm->mail_startup.options&MAIL_OPT_DEBUG_RX_BODY);
     AdvancedCheckListBox->Checked[i++]
         =(MainForm->mail_startup.options&MAIL_OPT_ALLOW_RX_BY_NUMBER);
+    AdvancedCheckListBox->Checked[i++]
+        =(MainForm->mail_startup.options&MAIL_OPT_ALLOW_SYSOP_ALIASES);
+
     AdvancedCheckListBox->Checked[i++]
         =(MainForm->mail_startup.options&MAIL_OPT_DNSBL_CHKRECVHDRS);
     AdvancedCheckListBox->Checked[i++]
@@ -293,12 +296,6 @@ void __fastcall TMailCfgDlg::OKBtnClick(TObject *Sender)
     	MainForm->mail_startup.options|=MAIL_OPT_DEBUG_POP3;
     else
 	    MainForm->mail_startup.options&=~MAIL_OPT_DEBUG_POP3;
-#if 0 /* this is a stupid option */
-	if(UserNumberCheckBox->Checked==true)
-    	MainForm->mail_startup.options|=MAIL_OPT_ALLOW_RX_BY_NUMBER;
-    else
-	    MainForm->mail_startup.options&=~MAIL_OPT_ALLOW_RX_BY_NUMBER;
-#endif
 	if(AllowRelayCheckBox->Checked==true)
     	MainForm->mail_startup.options|=MAIL_OPT_ALLOW_RELAY;
     else
@@ -349,6 +346,9 @@ void __fastcall TMailCfgDlg::OKBtnClick(TObject *Sender)
     setBit(&MainForm->mail_startup.options
         ,MAIL_OPT_ALLOW_RX_BY_NUMBER
         ,AdvancedCheckListBox->Checked[i++]);
+    setBit(&MainForm->mail_startup.options
+        ,MAIL_OPT_ALLOW_SYSOP_ALIASES
+        ,AdvancedCheckListBox->Checked[i++]);
     setBit(&MainForm->mail_startup.options
         ,MAIL_OPT_DNSBL_CHKRECVHDRS
         ,AdvancedCheckListBox->Checked[i++]);
diff --git a/src/sbbs3/ctrl/MailCfgDlgUnit.dfm b/src/sbbs3/ctrl/MailCfgDlgUnit.dfm
index 4786fbef49aa97b321310c5c8c3158f0fe4515fb..fa67802fc67b1c4a62dfb66206f67136bb1835b3 100644
--- a/src/sbbs3/ctrl/MailCfgDlgUnit.dfm
+++ b/src/sbbs3/ctrl/MailCfgDlgUnit.dfm
@@ -53,8 +53,8 @@ object MailCfgDlg: TMailCfgDlg
     Top = 4
     Width = 342
     Height = 245
-    ActivePage = SMTPTabSheet
-    TabIndex = 1
+    ActivePage = AdvancedTabSheet
+    TabIndex = 7
     TabOrder = 3
     object GeneralTabSheet: TTabSheet
       Caption = 'General'
@@ -877,6 +877,7 @@ object MailCfgDlg: TMailCfgDlg
           'SendMail: Ignore '#39'in transit'#39' attribute'
           'Retain received mail files (in temp directory)'
           'Allow receipt of mail by user number'
+          'Allow receipt of mail to '#39'sysop'#39' and '#39'postmaster'#39
           'Check '#39'Received'#39' header fields against DNSBL'
           'Throttle DNS blacklisted server sessions')
         TabOrder = 0