diff --git a/doc/README.bridging b/doc/README.bridging
index 345a58920e..7cb1d139bd 100644
--- a/doc/README.bridging
+++ b/doc/README.bridging
@@ -1,7 +1,5 @@
-
 Using ntopng in bridging mode
 -----------------------------
-
 0. Suppose you want to bridge zc:eth3 with zc:eth4. If the 
    interface names are different please adapt tools/load_hugepages.sh
 
@@ -20,4 +18,14 @@ Using ntopng in bridging mode
 NOTE:
 - Interface bridging is available in the professional version.
 - It can work (at lower speed and higher latency) also with non-ZC
-  network interfaces
\ No newline at end of file
+  network interfaces
+
+
+
+Enabling Captive Portal
+-----------------------
+Captive portal is used to authenticate legitimate users and bind them to the
+correct host pool. In order to enable this feature
+- you need the enterprise version of ntopng
+- the captive portal option must be enabled in the ntoopng preferences menu
+- ntopng must be active on port 80 and 443 for authenticating users (-w 80 -W 443)
diff --git a/include/Prefs.h b/include/Prefs.h
index 5f51578fe5..c13d25c068 100644
--- a/include/Prefs.h
+++ b/include/Prefs.h
@@ -49,7 +49,7 @@ class Prefs {
     enable_users_login, disable_localhost_login, online_license_check,
     enable_idle_local_hosts_cache,  enable_active_local_hosts_cache,
     enable_probing_alerts, enable_syslog_alerts, dump_flow_alerts_when_iface_alerted,
-    enable_top_talkers;
+    enable_top_talkers, enable_captive_portal;
   LocationPolicy dump_hosts_to_db, sticky_hosts;
   u_int non_local_host_max_idle, local_host_cache_duration, local_host_max_idle, flow_max_idle;
   u_int16_t intf_rrd_raw_days, intf_rrd_1min_days, intf_rrd_1h_days, intf_rrd_1d_days;
@@ -98,8 +98,9 @@ class Prefs {
   void setTraceLevelFromRedis();
   void setAlertsEnabledFromRedis();
 
- void bind_http_to_loopback()  { http_binding_address  = strdup((char*)CONST_LOOPBACK_ADDRESS); };
+  void bind_http_to_loopback()  { http_binding_address  = strdup((char*)CONST_LOOPBACK_ADDRESS); };
   void bind_https_to_loopback() { https_binding_address = strdup((char*)CONST_LOOPBACK_ADDRESS); };
+  bool getDefaultBoolPrefsValue(const char *pref_key, const bool default_value);
 
  public:
   Prefs(Ntop *_ntop);
@@ -219,8 +220,9 @@ class Prefs {
   inline char* getInterfaceAt(int id)     { return((id >= MAX_NUM_INTERFACES) ? NULL : ifNames[id].name); }
   inline pcap_direction_t getCaptureDirection() { return(captureDirection); }
   inline void setCaptureDirection(pcap_direction_t dir) { captureDirection = dir; }
-  inline bool hasCmdlTraceLevel()    { return has_cmdl_trace_lvl;      }
-  inline bool hasCmdlDisableAlerts() { return has_cmdl_disable_alerts; }
+  inline bool hasCmdlTraceLevel()      { return has_cmdl_trace_lvl;      }
+  inline bool hasCmdlDisableAlerts()   { return has_cmdl_disable_alerts; }
+  inline bool isCaptivePortalEnabled() { return(enable_captive_portal);  }
 };
 
 #endif /* _PREFS_H_ */
diff --git a/include/ntop_defines.h b/include/ntop_defines.h
index a1b5e51bf4..8ccd826d8b 100644
--- a/include/ntop_defines.h
+++ b/include/ntop_defines.h
@@ -371,9 +371,9 @@
 #define CONST_HOST_ACTIVITY_RRD_1D_DAYS    "ntopng.prefs.host_activity_rrd_1d_days"
 #define CONST_MAX_NUM_ALERTS_PER_ENTITY    "ntopng.prefs.max_num_alerts_per_entity"
 #define CONST_MAX_NUM_FLOW_ALERTS          "ntopng.prefs.max_num_flow_alerts"
-#define CONST_PROFILES_PREFS          "ntopng.prefs.profiles"
-#define CONST_PROFILES_COUNTERS       "ntopng.profiles_counters.ifid_%i"
-
+#define CONST_PROFILES_PREFS               "ntopng.prefs.profiles"
+#define CONST_PROFILES_COUNTERS            "ntopng.profiles_counters.ifid_%i"
+#define CONST_PREFS_CAPTIVE_PORTAL         "ntopng.prefs.enable_captive_portal"
 #define HOST_POOL_IDS_KEY             "ntopng.prefs.%u.host_pools.pool_ids"
 #define HOST_POOL_MEMBERS_KEY         "ntopng.prefs.%u.host_pools.members.%s"
 #define HOST_POOL_SHAPERS_KEY         "ntopng.prefs.%u.l7_policies.%s"
diff --git a/scripts/locales/en.lua b/scripts/locales/en.lua
index f3335877ad..de49de77ac 100644
--- a/scripts/locales/en.lua
+++ b/scripts/locales/en.lua
@@ -183,7 +183,7 @@ local  en = {
    },
 
    host_pools = {
-      pool = "Pool",
+      pool = "Pool Name",
       manage_pools = "Manage Pools",
       create_pools = "Create Pools",
       empty_pool = "Empty Pool",
diff --git a/scripts/lua/admin/host_pools.lua b/scripts/lua/admin/host_pools.lua
index 424abccc8b..f8bb624d0a 100644
--- a/scripts/lua/admin/host_pools.lua
+++ b/scripts/lua/admin/host_pools.lua
@@ -115,6 +115,9 @@ end
 --------------------------------------------------------------------------------
 
 print [[
+<hr>
+<H2>Edit Host Pools</H2>
+<br>
   <ul id="hostPoolsNav" class="nav nav-tabs" role="tablist">
     <li><a data-toggle="tab" role="tab" href="#manage">]] print(i18n("host_pools.manage_pools")) print[[</a></li>
     <li><a data-toggle="tab" role="tab" href="#create">]] print(i18n("host_pools.create_pools")) print[[</a></li>
@@ -202,11 +205,13 @@ print[[
 
       return count == 1;
     }
-  </script>]]
+  </script>
+]]
 
 -- ==== Manage tab ====
 
 print [[
+
   <script>
     var maxMembersNum = ]] print(tostring(host_pools_utils.MAX_MEMBERS_NUM)) print[[;
     var addedMemberCtr = 0;
diff --git a/scripts/lua/admin/prefs.lua b/scripts/lua/admin/prefs.lua
index a47e4a7b19..da5d3072d5 100644
--- a/scripts/lua/admin/prefs.lua
+++ b/scripts/lua/admin/prefs.lua
@@ -9,7 +9,7 @@ require "lua_utils"
 require "prefs_utils"
 require "blacklist_utils"
 
-if (ntop.isPro()) then
+if(ntop.isPro()) then
   package.path = dirs.installdir .. "/scripts/lua/pro/?.lua;" .. package.path
   require "report_utils"
 end
@@ -49,12 +49,16 @@ local menu_subpages = {
   {id="on_disk_rrds",  label="On-Disk Timeseries",   advanced=false, pro_only=false,  disabled=false},
   {id="on_disk_dbs",   label="On-Disk Databases",    advanced=true,  pro_only=false,  disabled=false},
   {id="alerts",        label="Alerts",               advanced=false, pro_only=false,  disabled=(prefs.has_cmdl_disable_alerts == true)},
-  {id="protocols",   label="Protocols",            advanced=false, pro_only=false,  disabled=false},
+  {id="protocols",     label="Protocols",            advanced=false, pro_only=false,  disabled=false},
   {id="report",        label="Units of Measurement", advanced=false, pro_only=false,  disabled=false},
   {id="logging",       label="Log Level",            advanced=false, pro_only=false,  disabled=(prefs.has_cmdl_trace_lvl == true)},
   {id="nbox",          label="nBox Integration",     advanced=true,  pro_only=true,   disabled=false},
 }
 
+if(info["version.enterprise_edition"]) then
+   table.insert(menu_subpages, {id="bridging",          label="Traffic Bridging",     advanced=false,  pro_only=true,   disabled=false})
+end
+
 for _, subpage in ipairs(menu_subpages) do
   if((subpage.disabled) or
      ((subpage.advanced) and (not show_advanced_prefs)) or  -- restore default in case of simple preferences
@@ -267,7 +271,7 @@ function printAlerts()
 		       "", nil, showElements and showSlackNotificationPrefs, true, true, {attributes={spellcheck="false"}})
 
 
-  if (ntop.isPro()) then
+  if(ntop.isPro()) then
     print('<tr><th colspan=2 class="info">Nagios Integration</th></tr>')
 
     local alertsEnabled = showElements
@@ -325,6 +329,28 @@ end
 
 -- ================================================================================
 
+function printBridgingPrefs()
+  print('<form method="post">')
+
+  print('<table class="table">')
+
+  print('<tr><th colspan=2 class="info">User Authentication</th></tr>')
+
+  toggleTableButtonPrefs("Captive Portal",
+        "Enable the web captive portal for authenticating network users.",
+        "On", "1", "success",
+        "Off", "0", "danger",
+        "toggle_captive_portal", "ntopng.prefs.enable_captive_portal", "0")
+
+  print('<tr><th colspan=2 style="text-align:right;"><button type="submit" class="btn btn-primary" style="width:115px">Save</button></th></tr>')
+
+  print('</table>')
+  print [[<input id="csrf" name="csrf" type="hidden" value="]] print(ntop.getRandomCSRFValue()) print [[" />
+  </form> ]]
+end
+
+-- ================================================================================
+
 function printNbox()
   print('<form method="post">')
   print('<table class="table">')
@@ -382,8 +408,8 @@ function printUsers()
      local elementToSwitch = {"row_multiple_ldap_account_type", "row_toggle_ldap_anonymous_bind","server","bind_dn", "bind_pwd", "search_path", "user_group", "admin_group"}
      local showElementArray = {false, true, true}
      local javascriptAfterSwitch = "";
-     javascriptAfterSwitch = javascriptAfterSwitch.."  if ($(\"#id-toggle-multiple_ldap_authentication\").val() != \"local\"  ) {\n"
-     javascriptAfterSwitch = javascriptAfterSwitch.."    if ($(\"#toggle_ldap_anonymous_bind_input\").val() == \"0\") {\n"
+     javascriptAfterSwitch = javascriptAfterSwitch.."  if($(\"#id-toggle-multiple_ldap_authentication\").val() != \"local\"  ) {\n"
+     javascriptAfterSwitch = javascriptAfterSwitch.."    if($(\"#toggle_ldap_anonymous_bind_input\").val() == \"0\") {\n"
      javascriptAfterSwitch = javascriptAfterSwitch.."      $(\"#bind_dn\").css(\"display\",\"table-row\");\n"
      javascriptAfterSwitch = javascriptAfterSwitch.."      $(\"#bind_pwd\").css(\"display\",\"table-row\");\n"
      javascriptAfterSwitch = javascriptAfterSwitch.."    } else {\n"
@@ -440,11 +466,11 @@ function printUsers()
   </form>
   <script>
     function save_button_users(){
-      if (typeof $("#id-toggle-multiple_ldap_authentication").val() !== 'undefined'
+      if(typeof $("#id-toggle-multiple_ldap_authentication").val() !== 'undefined'
           && $("#id-toggle-multiple_ldap_authentication").val() != "local") {
         var field = $("#id_input_server").val();
 
-        if ((field.substring(0, 7) != "ldap://") && (field.substring(0, 8) != "ldaps://")) {
+        if((field.substring(0, 7) != "ldap://") && (field.substring(0, 8) != "ldaps://")) {
           alert("Invalid LDAP Server Address Value: missing \"ldap://\" or \"ldaps://\" at beginning.");
           return false;
         }
@@ -660,36 +686,49 @@ print[[
 
         </td><td colspan=2 style="padding-left: 14px;border-left-style: groove; border-width:1px; border-color: #e0e0e0;">]]
 
-if (subpage_active == "report") then
+if(subpage_active == "report") then
    printReportVisualization()
 end
-if (subpage_active == "in_memory") then
+
+if(subpage_active == "in_memory") then
    printInMemory()
 end
-if (subpage_active == "on_disk_rrds") then
+
+if(subpage_active == "on_disk_rrds") then
    printStatsRrds()
 end
-if (subpage_active == "on_disk_dbs") then
+
+if(subpage_active == "on_disk_dbs") then
    printStatsDatabases()
 end
-if (subpage_active == "alerts") then
+
+if(subpage_active == "alerts") then
    printAlerts()
 end
-if (subpage_active == "protocols") then
+
+if(subpage_active == "protocols") then
    printProtocolPrefs()
 end
-if (subpage_active == "nbox") then
-  if (ntop.isPro()) then
+
+if(subpage_active == "nbox") then
+  if(ntop.isPro()) then
      printNbox()
   end
 end
-if (subpage_active == "users") then
+
+if(subpage_active == "bridging") then
+  if(info["version.enterprise_edition"]) then
+     printBridgingPrefs()
+  end
+end
+
+if(subpage_active == "users") then
    printUsers()
 end
-if (subpage_active == "ifaces") then
+if(subpage_active == "ifaces") then
    printInterfaces()
 end
-if (subpage_active == "logging") then
+if(subpage_active == "logging") then
    printLogging()
 end
 
diff --git a/scripts/lua/if_stats.lua b/scripts/lua/if_stats.lua
index fea62b44aa..33d0296b43 100644
--- a/scripts/lua/if_stats.lua
+++ b/scripts/lua/if_stats.lua
@@ -1109,7 +1109,7 @@ print [[<div id="protocols" class="tab-pane"><br>
 	    if(pool.id == selected_pool.id) then print(" selected") end
 	    print(">"..(pool.name).."</option>\n")
    end
-print("</select>")
+print('</select> <A HREF='..  ntop.getHttpPrefix()..'/lua/admin/host_pools.lua><i class="fa fa-pencil fa-lg" aria-hidden="true"></i></A>')
 
 print[[<form id="l7ProtosForm" onsubmit="return checkShapedProtosFormCallback();" method="post">
    <input type="hidden" name="target_pool" value="]] print(selected_pool.id) print[[">
diff --git a/src/HTTPserver.cpp b/src/HTTPserver.cpp
index e9262ba214..5bfb63c530 100644
--- a/src/HTTPserver.cpp
+++ b/src/HTTPserver.cpp
@@ -69,13 +69,20 @@ int send_error(struct mg_connection *conn, int status, const char *reason, const
 
 static void redirect_to_ssl(struct mg_connection *conn,
                             const struct mg_request_info *request_info) {
-  const char *p, *host = mg_get_header(conn, "Host");
+  const char *host = mg_get_header(conn, "Host");
   //  u_int16_t port = ntop->get_HTTPserver()->get_port();
-
-  if(host != NULL && (p = strchr(host, ':')) != NULL) {
-    mg_printf(conn, "HTTP/1.1 302 Found\r\n"
-              "Location: https://%.*s:%u/%s\r\n\r\n",
-              (int) (p - host), host, ntop->getPrefs()->get_https_port(), request_info->uri);
+  
+  if(host != NULL) {
+    const char *p = strchr(host, ':');
+    
+    if(p)
+      mg_printf(conn, "HTTP/1.1 302 Found\r\n"
+		"Location: https://%.*s:%u/%s\r\n\r\n",
+		(int) (p - host), host, ntop->getPrefs()->get_https_port(), request_info->uri);
+    else
+      mg_printf(conn, "HTTP/1.1 302 Found\r\n"
+		"Location: https://%s:%u/%s\r\n\r\n",
+		host, ntop->getPrefs()->get_https_port(), request_info->uri);
   } else {
     mg_printf(conn, "%s", "HTTP/1.1 500 Error\r\n\r\nHost: header is not set");
   }
diff --git a/src/Prefs.cpp b/src/Prefs.cpp
index 2da255b804..1414d9fd15 100755
--- a/src/Prefs.cpp
+++ b/src/Prefs.cpp
@@ -58,7 +58,7 @@ Prefs::Prefs(Ntop *_ntop) {
   redis_db_id = 0;
   dns_mode = 0;
   logFd = NULL;
-  disable_alerts = false;
+  disable_alerts = enable_captive_portal = false;
   enable_top_talkers = false;
   max_num_alerts_per_entity = ALERTS_MANAGER_MAX_ENTITY_ALERTS;
   max_num_flow_alerts = ALERTS_MANAGER_MAX_FLOW_ALERTS;
@@ -394,9 +394,18 @@ void Prefs::getDefaultStringPrefsValue(const char *pref_key, char **buffer, cons
 
 /* ******************************************* */
 
-void Prefs::reloadPrefsFromRedis() {
-  char rsp[32];
+bool Prefs::getDefaultBoolPrefsValue(const char *pref_key, const bool default_value) {
+  char rsp[8];
   
+  if(ntop->getRedis()->get((char*)pref_key, rsp, sizeof(rsp)) == 0)
+    return((rsp[0] == '1') ? true : false);
+  else
+    return(default_value);
+}
+  
+/* ******************************************* */
+
+void Prefs::reloadPrefsFromRedis() {
   /* Attempt to load preferences set from the web ui and apply default values in not found */
   local_host_cache_duration = getDefaultPrefsValue(CONST_LOCAL_HOST_CACHE_DURATION_PREFS, LOCAL_HOSTS_CACHE_DURATION);
   local_host_max_idle       = getDefaultPrefsValue(CONST_LOCAL_HOST_IDLE_PREFS, MAX_LOCAL_HOST_IDLE);
@@ -439,8 +448,9 @@ void Prefs::reloadPrefsFromRedis() {
   enable_syslog_alerts  = getDefaultPrefsValue(CONST_RUNTIME_PREFS_ALERT_SYSLOG,
 					       CONST_DEFAULT_ALERT_SYSLOG_ENABLED);
 
-  slack_enabled = ((ntop->getRedis()->get((char*)ALERTS_MANAGER_NOTIFICATION_WEBHOOK, rsp, sizeof(rsp)) == 0) && rsp[0] != '\0') ? true : false;
-    
+  slack_enabled = getDefaultBoolPrefsValue(ALERTS_MANAGER_NOTIFICATION_WEBHOOK, false);
+  enable_captive_portal = getDefaultBoolPrefsValue(CONST_PREFS_CAPTIVE_PORTAL, false);
+
   setTraceLevelFromRedis();
   setAlertsEnabledFromRedis();
 }