diff --git a/src/sbbs3/ctrl/TelnetCfgDlgUnit.cpp b/src/sbbs3/ctrl/TelnetCfgDlgUnit.cpp
index 720fd834928efa6555bb7425689da596b196ce9f..643d6baf63b60e2c768efc94d4be01b6bd1a84cd 100644
--- a/src/sbbs3/ctrl/TelnetCfgDlgUnit.cpp
+++ b/src/sbbs3/ctrl/TelnetCfgDlgUnit.cpp
@@ -97,6 +97,8 @@ void __fastcall TTelnetCfgDlg::FormShow(TObject *Sender)
         =MainForm->bbs_startup.options&BBS_OPT_USE_2ND_RLOGIN;
     QWKEventsCheckBox->Checked
         =!(MainForm->bbs_startup.options&BBS_OPT_NO_QWK_EVENTS);
+    JavaScriptCheckBox->Checked
+        =!(MainForm->bbs_startup.options&BBS_OPT_NO_JAVASCRIPT);
 
     RLoginEnabledCheckBoxClick(Sender);
     PageControl->ActivePage=GeneralTabSheet;
@@ -170,6 +172,11 @@ void __fastcall TTelnetCfgDlg::OKBtnClick(TObject *Sender)
         MainForm->bbs_startup.options&=~BBS_OPT_NO_QWK_EVENTS;
     else
         MainForm->bbs_startup.options|=BBS_OPT_NO_QWK_EVENTS;
+    if(JavaScriptCheckBox->Checked==true)
+        MainForm->bbs_startup.options&=~BBS_OPT_NO_JAVASCRIPT;
+    else
+        MainForm->bbs_startup.options|=BBS_OPT_NO_JAVASCRIPT;
+
     if(AutoLogonCheckBox->Checked==true)
     	MainForm->bbs_startup.options|=BBS_OPT_AUTO_LOGON;
     else
diff --git a/src/sbbs3/ctrl/TelnetCfgDlgUnit.dfm b/src/sbbs3/ctrl/TelnetCfgDlgUnit.dfm
index 636876e33e22aea15d0e3d6d961505cc02ee9338..7321a288908ed98f59c8113e9b16175a99acebb6 100644
--- a/src/sbbs3/ctrl/TelnetCfgDlgUnit.dfm
+++ b/src/sbbs3/ctrl/TelnetCfgDlgUnit.dfm
@@ -17,7 +17,7 @@ object TelnetCfgDlg: TTelnetCfgDlg
     Top = 4
     Width = 342
     Height = 229
-    ActivePage = RLoginTabSheet
+    ActivePage = GeneralTabSheet
     TabOrder = 0
     object GeneralTabSheet: TTabSheet
       Caption = 'General'
@@ -101,6 +101,17 @@ object TelnetCfgDlg: TTelnetCfgDlg
         ShowHint = True
         TabOrder = 5
       end
+      object JavaScriptCheckBox: TCheckBox
+        Left = 182
+        Top = 140
+        Width = 144
+        Height = 25
+        Hint = 'Enable JavaScript Support'
+        Caption = 'JavaScript Support'
+        ParentShowHint = False
+        ShowHint = True
+        TabOrder = 6
+      end
     end
     object TelnetTabSheet: TTabSheet
       Caption = 'Telnet'
diff --git a/src/sbbs3/ctrl/TelnetCfgDlgUnit.h b/src/sbbs3/ctrl/TelnetCfgDlgUnit.h
index a3c4f9c11fdb85d57660954eb363f9dade630009..b971db626880c73bb39b644c6aae5bc4a0075cc8 100644
--- a/src/sbbs3/ctrl/TelnetCfgDlgUnit.h
+++ b/src/sbbs3/ctrl/TelnetCfgDlgUnit.h
@@ -90,6 +90,7 @@ __published:
     TButton *RLoginIPallowButton;
     TCheckBox *RLogin2ndNameCheckBox;
         TCheckBox *QWKEventsCheckBox;
+    TCheckBox *JavaScriptCheckBox;
 	void __fastcall FormShow(TObject *Sender);
 	void __fastcall OKBtnClick(TObject *Sender);
 	void __fastcall AnswerSoundButtonClick(TObject *Sender);