diff --git a/src/opnsense/scripts/OPNsense/CaptivePortal/set_session_restrictions.py b/src/opnsense/scripts/OPNsense/CaptivePortal/set_session_restrictions.py
new file mode 100755
index 000000000..151f4ba2a
--- /dev/null
+++ b/src/opnsense/scripts/OPNsense/CaptivePortal/set_session_restrictions.py
@@ -0,0 +1,54 @@
+#!/usr/local/bin/python2.7
+"""
+    Copyright (c) 2015 Ad Schellevis
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+    --------------------------------------------------------------------------------------
+    update (or add) client/session restrictions
+"""
+import sys
+import ujson
+from lib.db import DB
+
+parameters = {'zoneid': '', 'sessionid': None, 'session_timeout': None, 'output_type': 'plain'}
+current_param = None
+for param in sys.argv[1:]:
+    if len(param) > 1 and param[0] == '/' and param[1:] in parameters:
+        current_param = param[1:].lower()
+    elif current_param is not None:
+        parameters[current_param] = param.strip()
+        current_param = None
+
+response = dict()
+if parameters['zoneid'] is not None and parameters['sessionid'] is not None:
+    db = DB()
+    response['response'] = db.update_session_restrictions(parameters['zoneid'],
+                                                          parameters['sessionid'],
+                                                          parameters['session_timeout'])
+
+# output result as plain text or json
+if parameters['output_type'] != 'json':
+    for item in response:
+        print '%20s %s' % (item, response[item])
+else:
+    print(ujson.dumps(response))
diff --git a/src/opnsense/service/conf/actions.d/actions_captiveportal.conf b/src/opnsense/service/conf/actions.d/actions_captiveportal.conf
index 9ccb5fe6c..3d1b0f1a1 100644
--- a/src/opnsense/service/conf/actions.d/actions_captiveportal.conf
+++ b/src/opnsense/service/conf/actions.d/actions_captiveportal.conf
@@ -16,6 +16,13 @@ parameters:/zoneid %s /sessionid %s /output_type %s
 type:script_output
 message:disconnect client
 
+[set.session_restrictions]
+command:/usr/local/opnsense/scripts/OPNsense/CaptivePortal/set_session_restrictions.py
+parameters:/zoneid %s /sessionid %s /session_timeout %s /output_type %s
+type:script_output
+message:set extra restrictions for session (%s) %s 
+
+
 [start]
 command:/usr/local/etc/rc.d/captiveportal start
 parameters: