diff --git a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml
index b554322f7..b471d5a51 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml
@@ -27,6 +27,20 @@
         <help><![CDATA[Select authentication methods to use, leave empty for no authentication needed.]]></help>
         <hint>Type or select server.</hint>
     </field>
+    <field>
+        <id>zone.idletimeout</id>
+        <label>idle timeout (minutes)</label>
+        <type>text</type>
+        <help><![CDATA[Clients will be disconnected after this amount of inactivity. They may log in again immediately, though. Leave this field blank for no idle timeout.]]></help>
+        <hint>Type or select server.</hint>
+    </field>
+    <field>
+        <id>zone.hardtimeout</id>
+        <label>hard timeout (minutes)</label>
+        <type>text</type>
+        <help><![CDATA[Clients will be disconnected after this amount of time, regardless of activity. They may log in again immediately, though. Leave this field blank for no hard timeout (not recommended unless an idle timeout is set).]]></help>
+        <hint>Type or select server.</hint>
+    </field>
     <field>
         <id>zone.description</id>
         <label>description</label>
diff --git a/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml b/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml
index 718f60ce6..ffd8e739b 100644
--- a/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml
@@ -30,6 +30,20 @@
                     <multiple>Y</multiple>
                     <default>Local Database</default>
                 </authservers>
+                <idletimeout type="IntegerField">
+                    <Required>Y</Required>
+                    <Default>0</Default>
+                    <MinimumValue>0</MinimumValue>
+                    <MaximumValue>10080</MaximumValue>
+                    <ValidationMessage>Idle timeout must be between 0(no timeout) and 10080 (a week)</ValidationMessage>
+                </idletimeout>
+                <hardtimeout type="IntegerField">
+                    <Required>Y</Required>
+                    <Default>0</Default>
+                    <MinimumValue>0</MinimumValue>
+                    <MaximumValue>10080</MaximumValue>
+                    <ValidationMessage>Hard timeout must be between 0(no timeout) and 10080 (a week)</ValidationMessage>
+                </hardtimeout>
                 <description type="TextField">
                     <Required>Y</Required>
                     <mask>/^([\t\n\v\f\r 0-9a-zA-Z.,_\x{00A0}-\x{FFFF}]){1,255}$/u</mask>