diff --git a/pandora_console/godmode/setup/license.php b/pandora_console/godmode/setup/license.php
index 518d4bab97..daa0152f3f 100644
--- a/pandora_console/godmode/setup/license.php
+++ b/pandora_console/godmode/setup/license.php
@@ -121,6 +121,11 @@ foreach ($rows as $row) {
     $settings->{$row['key']} = $row['value'];
 }
 
+if ($settings->customer_key === 'PANDORA-ENTERPRISE-FREE') {
+    $license['limit'] = 50;
+    $license['license_mode'] = 'FREE';
+}
+
 ?>
 <script type="text/javascript">
 var texts = {
diff --git a/pandora_console/godmode/um_client/index.php b/pandora_console/godmode/um_client/index.php
index 1a78e39b5f..46f432c6d5 100644
--- a/pandora_console/godmode/um_client/index.php
+++ b/pandora_console/godmode/um_client/index.php
@@ -65,7 +65,7 @@ if (isset($config['lts_updates']) === false) {
 }
 
 if (empty($license) === true) {
-    $license = 'PANDORA-FREE';
+    $license = 'PANDORA-ENTERPRISE-FREE';
 }
 
 $mode_str = '';
@@ -81,7 +81,7 @@ if ($mode === Manager::MODE_ONLINE) {
 
 enterprise_include_once('/include/functions_license.php');
 $license_data = enterprise_hook('license_get_info');
-if ($license_data !== ENTERPRISE_NOT_HOOK) {
+if ($license_data !== ENTERPRISE_NOT_HOOK && $license !== 'PANDORA-ENTERPRISE-FREE') {
     $days_to_expiry = ((strtotime($license_data['expiry_date']) - time()) / (60 * 60 * 24));
 
     if ((int) $license_data['limit_mode'] === 0) {
@@ -91,7 +91,7 @@ if ($license_data !== ENTERPRISE_NOT_HOOK) {
         $limit = db_get_value('count(*)', 'tagente_modulo', 'disabled', 0);
     }
 
-    if ($limit > $license_data['limit']) {
+    if ($limit > ($license_data['limit'] * 1.1)) {
         ui_print_warning_message(
             __(
                 'You cannot use update manager %s. You are exceding monitoring limits by %s elements. Please update your license or disable enterprise section by moving enterprise directory to another location and try again.',
@@ -112,20 +112,6 @@ if ($license_data !== ENTERPRISE_NOT_HOOK) {
         );
         return;
     }
-
-    if (rtrim($license_data['licensed_to']) === Manager::PANDORA_TRIAL_ISSUER) {
-        $product_name = get_product_name();
-
-        ui_print_info_message(
-            __(
-                'You cannot use update manager %s. This license is a trial license to test all %s features. Please update your license to unlock all %s features.',
-                $mode_str,
-                $product_name,
-                $product_name
-            )
-        );
-        return;
-    }
 } else {
     $license_data = [];
     $license_data['count_enabled'] = db_get_value(
diff --git a/pandora_console/godmode/update_manager/modal_lts_update.php b/pandora_console/godmode/update_manager/modal_lts_update.php
index 349e378b40..31b35316e2 100644
--- a/pandora_console/godmode/update_manager/modal_lts_update.php
+++ b/pandora_console/godmode/update_manager/modal_lts_update.php
@@ -134,8 +134,8 @@ if ($stop_lts_modal === '0') {
             }],
             open: function(event, ui) {
                 $(".ui-dialog-titlebar-close").hide();
-                $("div.ui-dialog-buttonset").addClass('flex-rr-sb-important');
-                $("div.ui-dialog-buttonset").append(`
+                $(".ui-dialog-buttonpane").children(":first").addClass('flex-rr-sb-important');
+                $(".ui-dialog-buttonpane").children(":first").append(`
                 <div class="welcome-wizard-buttons">
                     <label class="flex-row-center">
                         <input type="checkbox" id="checkbox-no_show_more" class="welcome-wizard-do-not-show"/>
diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index e3c049d758..dc48242cb3 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -1926,6 +1926,9 @@ class DiscoveryTaskList extends HTML
 
         // License precheck.
         $license = enterprise_hook('license_get_info');
+        if (empty($license) === false && license_enterprise_free() === true) {
+            $license['limit'] = 50;
+        }
 
         if (is_array($license) === true
             && $n_agents > ($license['limit'] - $license['count_enabled'])
diff --git a/pandora_console/godmode/wizards/HostDevices.class.php b/pandora_console/godmode/wizards/HostDevices.class.php
index 3679db253b..97cc9c439c 100755
--- a/pandora_console/godmode/wizards/HostDevices.class.php
+++ b/pandora_console/godmode/wizards/HostDevices.class.php
@@ -1175,6 +1175,10 @@ class HostDevices extends Wizard
 
             // License precheck.
             $license = enterprise_hook('license_get_info');
+            if (empty($license) === false && license_enterprise_free() === true) {
+                $license['limit'] = 50;
+            }
+
             $n_agents = 0;
             foreach (explode(',', $this->task['subnet']) as $net) {
                 $mask = explode('/', $net, 2)[1];
diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php
index 884991c9f2..2c154842fd 100644
--- a/pandora_console/include/class/ConsoleSupervisor.php
+++ b/pandora_console/include/class/ConsoleSupervisor.php
@@ -1081,6 +1081,25 @@ class ConsoleSupervisor
     {
         global $config;
 
+        if (license_enterprise_free() === true) {
+            if (isset($config['limit_exceeded']) === true && (int) $config['limit_exceeded'] === 1) {
+                update_config_token('limit_exceeded', 0);
+
+                $message = __('When the limit is exceeded the system automatically deactivates the latest agents and modules exceeding license.');
+
+                $this->notify(
+                    [
+                        'type'    => 'NOTIF.LICENSE.LIMITED',
+                        'title'   => __('You have exceeded the limit of the free version'),
+                        'message' => $message,
+                        'url'     => '__url__/index.php?sec=gagente&sec2=godmode/agentes/modificar_agente',
+                    ]
+                );
+            }
+
+            return true;
+        }
+
         $license = enterprise_hook('license_get_info');
         if ($license === ENTERPRISE_NOT_HOOK) {
             return false;
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 3541335fad..dace338423 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -1682,6 +1682,24 @@ function license_free()
 }
 
 
+/**
+ * Check if the license is PANDORA-ENTERPRISE-FREE.
+ *
+ * @return boolean.
+ */
+function license_enterprise_free()
+{
+    $return = true;
+
+    $pandora_license = db_get_value('value', 'tupdate_settings', '`key`', 'customer_key');
+    if ($pandora_license !== 'PANDORA-ENTERPRISE-FREE') {
+        $return = false;
+    }
+
+    return $return;
+}
+
+
 /**
  * TODO: Document enterprise functions
  */
diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index 048fea7f9e..0ca6bdbce5 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -435,7 +435,11 @@ function api_get_license($trash1, $trash2, $trash3, $returnType='json')
     if ($license === ENTERPRISE_NOT_HOOK) {
         // Not an enterprise environment?
         if (license_free()) {
-            $license = 'PANDORA_FREE';
+            $license = 'PANDORA-FREE';
+        }
+
+        if (license_enterprise_free() === true) {
+            $license = 'PANDORA-ENTERPRISE-FREE';
         }
 
         returnData(
@@ -494,6 +498,10 @@ function api_get_license_remaining(
         return;
     }
 
+    if (license_enterprise_free() === true) {
+        $license['limit'] = 50;
+    }
+
     returnData(
         $returnType,
         [
diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index dc417c191b..2a0b88314d 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -900,6 +900,7 @@ if (is_ajax()) {
         global $config;
         global $pandora_version;
         global $build_version;
+        $license = db_get_value_sql('SELECT `value` FROM tupdate_settings WHERE `key` LIKE "customer_key"');
         $product_name = io_safe_output(get_product_name());
         $license_expiry_date = substr($config['license_expiry_date'], 0, 4).'/'.substr($config['license_expiry_date'], 4, 2).'/'.substr($config['license_expiry_date'], 6, 2);
         $license_expired = false;
@@ -908,6 +909,11 @@ if (is_ajax()) {
             $license_expired = true;
         }
 
+        $text = (enterprise_installed()) ? 'Enterprise' : 'Community';
+        if ($license === 'PANDORA-ENTERPRISE-FREE') {
+            $text = 'FREE';
+        }
+
         include_once $config['homedir'].'/include/class/Diagnostics.class.php';
         $d = new Diagnostics;
         $db_health = json_decode($d->getDatabaseHealthStatus());
@@ -970,16 +976,18 @@ if (is_ajax()) {
                                 </th>
                                 <th style="width: 60%; text-align: left; border: 0px;">
                                     <h1>'.$product_name.'</h1>
-                                    <p><span>'.__('Version').' '.$pandora_version.$lts_name.' - '.(enterprise_installed() ? 'Enterprise' : 'Community').'</span></p>
+                                    <p><span>'.__('Version').' '.$pandora_version.$lts_name.' - '.$text.'</span></p>
                                     <p><span>'.__('Current package').'</span> '.$config['current_package'].'</p>
                                     <p><span>'.__('MR version').'</span> MR'.$config['MR'].'</p>                                    
                                     <p><span>Build</span>'.$build_version.'</p>';
-        if (enterprise_installed() === true) {
+        if (enterprise_installed() === true && $license !== 'PANDORA-ENTERPRISE-FREE') {
             $dialog .= '<p><span>'.__('Support expires').'</span>'.$license_expiry_date.'</p>';
         }
 
         if ($license_expired === false) {
             $dialog .= '<p>'.__('This system has official support, warranty and official updates.').'</p>';
+        } else if ($license === 'PANDORA-ENTERPRISE-FREE') {
+            $dialog .= '<p><span>'.__('This system has no active support contract.').'</span></p>';
         } else if (enterprise_installed() === true) {
             $dialog .= '<p><span>'.__('This system has no active support contract, and has no support, upgrades or warranty.').'</span></p>';
             $dialog .= '<p><b><a href="https://pandorafms.com/contact/" target="_blank">'.__('Contact Pandora FMS for expand your support contract.').'</a></b></p>';
@@ -1280,6 +1288,7 @@ if (is_ajax()) {
         global $config;
         global $pandora_version;
         global $build_version;
+        $license = db_get_value_sql('SELECT `value` FROM tupdate_settings WHERE `key` LIKE "customer_key"');
         $product_name = io_safe_output(get_product_name());
         $license_expiry_date = substr($config['license_expiry_date'], 0, 4).'/'.substr($config['license_expiry_date'], 4, 2).'/'.substr($config['license_expiry_date'], 6, 2);
         $license_expired = false;
@@ -1288,6 +1297,11 @@ if (is_ajax()) {
             $license_expired = true;
         }
 
+        $text = (enterprise_installed()) ? 'Enterprise' : 'Community';
+        if ($license === 'PANDORA-ENTERPRISE-FREE') {
+            $text = 'FREE';
+        }
+
         $lts_name = '';
         if (empty($config['lts_name']) === false) {
             $lts_name = ' <i>'.$config['lts_name'].'</i>';
@@ -1313,15 +1327,17 @@ if (is_ajax()) {
                                 </th>
                                 <th style="width: 60%; text-align: left; border: 0px;">
                                     <h1>'.$product_name.'</h1>
-                                    <p><span>'.__('Version').' '.$pandora_version.$lts_name.' - '.(enterprise_installed() ? 'Enterprise' : 'Community').'</span></p>
+                                    <p><span>'.__('Version').' '.$pandora_version.$lts_name.' - '.$text.'</span></p>
                                     <p><span>'.__('MR version').'</span> MR'.$config['MR'].'</p>
                                     <p><span>Build</span>'.$build_version.'</p>';
-        if (enterprise_installed() === true) {
+        if (enterprise_installed() === true && $license !== 'PANDORA-ENTERPRISE-FREE') {
             $dialog .= '<p><span>'.__('Support expires').'</span>'.$license_expiry_date.'</p>';
         }
 
         if ($license_expired === false) {
             $dialog .= '<p>'.__('This system has official support, warranty and official updates.').'</p>';
+        } else if ($license === 'PANDORA-ENTERPRISE-FREE') {
+            $dialog .= '<p><span>'.__('This system has no active support contract.').'</span></p>';
         } else if (enterprise_installed() === true) {
             $dialog .= '<p><span>'.__('This system has no active support contract, and has no support, upgrades or warranty.').'</span></p>';
             $dialog .= '<p><b><a href="https://pandorafms.com/contact/" target="_blank">'.__('Contact Pandora FMS for expand your support contract.').'</a></b></p>';
diff --git a/pandora_console/include/javascript/jquery.pandora.js b/pandora_console/include/javascript/jquery.pandora.js
index bc94cf8fbe..4e0c76059d 100644
--- a/pandora_console/include/javascript/jquery.pandora.js
+++ b/pandora_console/include/javascript/jquery.pandora.js
@@ -176,6 +176,8 @@ $(document).ready(function() {
 
     if (typeof hide_counter == "undefined") hide_counter = 0;
 
+    if (typeof remaining == "undefined") remaining = 30;
+
     let height = 300;
     if (typeof invalid_license != "undefined") height = 350;
 
@@ -194,8 +196,6 @@ $(document).ready(function() {
         },
         open: function() {
           if (hide_counter != 1) {
-            var remaining = 30;
-
             // Timeout counter.
             var count = function() {
               if (remaining > 0) {
@@ -246,6 +246,66 @@ $(document).ready(function() {
     });
   }
 
+  if ($("#register_dialog_message").length) {
+    function validateEmail(email) {
+      const re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+      return re.test(String(email).toLowerCase());
+    }
+
+    $("#register_dialog_message").dialog({
+      dialogClass: "no-close",
+      closeOnEscape: false,
+      resizable: false,
+      draggable: true,
+      modal: true,
+      height: "auto",
+      width: 800,
+      overlay: {
+        opacity: 0.5,
+        background: "black"
+      }
+    });
+
+    $("#button-register_buttom").click(function() {
+      if (validateEmail($("#text-license_email").val())) {
+        $.ajax({
+          method: "POST",
+          url: $("#hidden-test").val(),
+          dataType: "json",
+          data: {
+            page: "enterprise/load_enterprise",
+            register_email: 1,
+            email: $("#text-license_email").val()
+          },
+          success: function(data) {
+            if (data.error != null) {
+              $("#register_dialog_result").addClass("error");
+              $("#register_dialog_result_content").html("Unsuccessful register. "+ data.error);
+            } else {
+              $("#register_dialog_result_content").html("Successfully registered with UID: " + data.result);
+            }
+
+            $("#register_dialog_result").dialog({
+              buttons: [
+                {
+                  text: "OK",
+                  class: "submit-next",
+                  click: function() {
+                    $(this).dialog("close");
+                    $("#register_dialog_message").dialog("close");
+                    location.reload();
+                  }
+                }
+              ]
+            });
+          }
+        });
+      } else {
+        $("#text-license_email").css("border", "1px solid red");
+      }
+    });
+  }
+
   if ($("#msg_change_password").length) {
     $("#msg_change_password").dialog({
       resizable: false,
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 5e2dbb6755..7294d5c1d8 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -9786,6 +9786,12 @@ div.stat-win-spinner img {
   min-height: 350px !important;
 }
 
+p.license_p {
+  font-size: 12pt;
+  margin-left: 50px;
+  text-align: left;
+}
+
 .select2-container--default
   .select2-selection--multiple
   .select2-selection__rendered {
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 905d4264d3..0073a061e4 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -1219,7 +1219,7 @@ INSERT INTO `ttag` VALUES (1,'network','Network&#x20;equipment','http://pandoraf
 
 INSERT INTO `tevent_response` VALUES (1,'Ping&#x20;to&#x20;host','Ping&#x20;to&#x20;the&#x20;agent&#x20;host','ping&#x20;-c&#x20;5&#x20;_agent_address_','command',0,620,500,0,'',0,90,0),(5,'Restart&#x20;agent','Restart&#x20;the&#x20;agent&#x20;with&#x20;using&#x20;UDP&#x20;protocol.&#x0d;&#x0a;&#x0d;&#x0a;To&#x20;use&#x20;this&#x20;response&#x20;is&#x20;necessary&#x20;to&#x20;have&#x20;installed&#x20;Pandora&#x20;FMS&#x20;server&#x20;and&#x20;console&#x20;in&#x20;the&#x20;same&#x20;machine.','/usr/share/pandora_server/util/udp_client.pl&#x20;_agent_address_&#x20;41122&#x20;&quot;REFRESH&#x20;AGENT&quot;','command',0,620,500,0,'',0,90,0),(6,'Ping&#x20;to&#x20;module&#x20;agent&#x20;host','Ping&#x20;to&#x20;the&#x20;module&#x20;agent&#x20;host','ping&#x20;-c&#x20;5&#x20;_module_address_','command',0,620,500,0,'',0,90,0),(7,'Create&#x20;ticket&#x20;in&#x20;Pandora&#x20;ITSM&#x20;from&#x20;event','Create&#x20;a&#x20;ticket&#x20;in&#x20;Pandora&#x20;ITSM&#x20;from&#x20;an&#x20;event','index.php?sec=manageTickets&amp;sec2=operation/ITSM/itsm&amp;operation=edit&amp;from_event=_event_id_','url',0,0,0,1,'',0,90,1);
 
-INSERT INTO `tupdate_settings` VALUES  ('current_update', '412'), ('customer_key', 'PANDORA-FREE'), ('updating_binary_path', 'Path where the updated binary files will be stored'), ('updating_code_path', 'Path where the updated code is stored'), ('dbname', ''), ('dbhost', ''), ('dbpass', ''), ('dbuser', ''), ('dbport', ''), ('proxy', ''), ('proxy_port', ''), ('proxy_user', ''), ('proxy_pass', '');
+INSERT INTO `tupdate_settings` VALUES  ('current_update', '412'), ('customer_key', 'PANDORA-ENTERPRISE-FREE'), ('updating_binary_path', 'Path where the updated binary files will be stored'), ('updating_code_path', 'Path where the updated code is stored'), ('dbname', ''), ('dbhost', ''), ('dbpass', ''), ('dbuser', ''), ('dbport', ''), ('proxy', ''), ('proxy_port', ''), ('proxy_user', ''), ('proxy_pass', '');
 
 --
 -- Dumping data for table `tcollection`
diff --git a/pandora_console/update_manager_client/lib/UpdateManager/Client.php b/pandora_console/update_manager_client/lib/UpdateManager/Client.php
index 4dd1b81d0e..3a2aef5dd9 100644
--- a/pandora_console/update_manager_client/lib/UpdateManager/Client.php
+++ b/pandora_console/update_manager_client/lib/UpdateManager/Client.php
@@ -654,6 +654,17 @@ class Client
     }
 
 
+    /**
+     * Return license.
+     *
+     * @return string|null
+     */
+    public function getLicense()
+    {
+        return $this->license;
+    }
+
+
     /**
      * Executes a curl request.
      *
diff --git a/pandora_console/update_manager_client/lib/UpdateManager/UI/Manager.php b/pandora_console/update_manager_client/lib/UpdateManager/UI/Manager.php
index 8dd12e745f..76b8897979 100644
--- a/pandora_console/update_manager_client/lib/UpdateManager/UI/Manager.php
+++ b/pandora_console/update_manager_client/lib/UpdateManager/UI/Manager.php
@@ -292,21 +292,23 @@ class Manager
      */
     public function register()
     {
-        View::render(
-            'register',
-            [
-                'version'  => $this->umc->getVersion(),
-                'mr'       => $this->umc->getMR(),
-                'error'    => $this->umc->getLastError(),
-                'asset'    => function ($rp) {
-                    echo $this->getUrl($rp);
-                },
-                'authCode' => $this->authCode,
-                'ajax'     => $this->ajaxUrl,
-                'ajaxPage' => $this->ajaxPage,
-                'mode'     => self::MODE_REGISTER,
-            ]
-        );
+        if ($this->umc->getLicense() !== 'PANDORA-ENTERPRISE-FREE') {
+            View::render(
+                'register',
+                [
+                    'version'  => $this->umc->getVersion(),
+                    'mr'       => $this->umc->getMR(),
+                    'error'    => $this->umc->getLastError(),
+                    'asset'    => function ($rp) {
+                        echo $this->getUrl($rp);
+                    },
+                    'authCode' => $this->authCode,
+                    'ajax'     => $this->ajaxUrl,
+                    'ajaxPage' => $this->ajaxPage,
+                    'mode'     => self::MODE_REGISTER,
+                ]
+            );
+        }
     }
 
 
diff --git a/pandora_console/update_manager_client/resources/styles/um.css b/pandora_console/update_manager_client/resources/styles/um.css
index 056a2bc926..d7bf314192 100644
--- a/pandora_console/update_manager_client/resources/styles/um.css
+++ b/pandora_console/update_manager_client/resources/styles/um.css
@@ -451,6 +451,10 @@ span.warning {
   align-items: center;
   justify-content: space-between;
 }
+
+.ui-dialog-content.ui-widget-content#register_dialog_message {
+  display: inherit;
+}
 /*.ui-dialog-content.ui-widget-content p {
   font-size: 10pt;
   word-break: keep-all;