diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index b0d15d5cef..1acbfa0760 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -463,10 +463,6 @@ function config_update_config()
                         if (config_update_value('ipam_ocuppied_warning_treshold', get_parameter('ipam_ocuppied_warning_treshold'), true) === false) {
                             $error_update[] = __('Ipam Ocuppied Manager Warning');
                         }
-
-                        if (config_update_value('sap_license', get_parameter('sap_license'), true) === false) {
-                            $error_update[] = __('SAP/R3 Plugin Licence');
-                        }
                     }
                 break;
 
diff --git a/pandora_server/lib/PandoraFMS/DiscoveryServer.pm b/pandora_server/lib/PandoraFMS/DiscoveryServer.pm
index e6c42fab34..2d5928333d 100644
--- a/pandora_server/lib/PandoraFMS/DiscoveryServer.pm
+++ b/pandora_server/lib/PandoraFMS/DiscoveryServer.pm
@@ -221,10 +221,14 @@ sub data_consumer ($$) {
 
     if ($task->{'type'} == DISCOVERY_APP_SAP) {
       # SAP TASK, retrieve license.
-      $task->{'sap_license'} = pandora_get_config_value(
-        $dbh,
-        'sap_license'
-      );
+      if (defined($task->{'field4'}) && $task->{'field4'} ne "") {
+        $task->{'sap_license'} = $task->{'field4'};
+      } else {
+        $task->{'sap_license'} = pandora_get_config_value(
+          $dbh,
+          'sap_license'
+        );
+      }
 
       # Retrieve credentials for task (optional).
       if (defined($task->{'auth_strings'})