diff --git a/centreon-plugins/apps/salesforce/restapi/custom/api.pm b/centreon-plugins/apps/salesforce/restapi/custom/api.pm
index 98ac44c3c..f74ad94cb 100644
--- a/centreon-plugins/apps/salesforce/restapi/custom/api.pm
+++ b/centreon-plugins/apps/salesforce/restapi/custom/api.pm
@@ -41,9 +41,9 @@ sub new {
     
     if (!defined($options{noptions})) {
         $options{options}->add_options(arguments => {                      
-            'hostname:s'     => { name => 'hostname' },
-            'timeout:s'      => { name => 'timeout' },
-            'api-versions:s' => { name => 'api_version' }
+            'hostname:s'    => { name => 'hostname' },
+            'timeout:s'     => { name => 'timeout' },
+            'api-version:s' => { name => 'api_version' }
         });
     }
     $options{options}->add_help(package => __PACKAGE__, sections => 'REST API OPTIONS', once => 1);
@@ -143,9 +143,9 @@ Set hostname to query (default: 'api.status.salesforce.com')
 
 Set HTTP timeout in seconds (Default: '10').
 
-=item B<--api-path>
+=item B<--api-version>
 
-API base url path (Default: '/v1').
+API version (Default: 'v1').
 
 =back
 
diff --git a/centreon-plugins/apps/salesforce/restapi/mode/sfdcinstance.pm b/centreon-plugins/apps/salesforce/restapi/mode/sfdcinstance.pm
index e86f158aa..794b4d63d 100644
--- a/centreon-plugins/apps/salesforce/restapi/mode/sfdcinstance.pm
+++ b/centreon-plugins/apps/salesforce/restapi/mode/sfdcinstance.pm
@@ -24,7 +24,7 @@ use base qw(centreon::plugins::templates::counter);
 
 use strict;
 use warnings;
-use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold catalog_status_calc);
+use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold_ng);
 
 sub custom_status_output {
     my ($self, %options) = @_;
@@ -50,21 +50,19 @@ sub set_counters {
     ];
 
     $self->{maps_counters}->{salesforce} = [
-        { label => 'status', threshold => 0, set => {
+        { label => 'status', type => 2, critical_default => '%{status} !~ /OK/', set => {
                 key_values => [ { name => 'status' }, { name => 'active' }, { name => 'name' } ],
-                closure_custom_calc => \&catalog_status_calc,
                 closure_custom_output => $self->can('custom_status_output'),
                 closure_custom_perfdata => sub { return 0; },
-                closure_custom_threshold_check => \&catalog_status_threshold
+                closure_custom_threshold_check => \&catalog_status_threshold_ng
             }
         },
         { label => 'incident', nlabel => 'salesforce.incident.current.count', set => {
                 key_values => [ { name => 'incident' } ],
                 output_template => '%s incidents currently',
                 perfdatas => [
-                    { label => 'incident', value => 'incident', template => '%s',
-                      min => 0, label_extra_instance => 1 },
-                ],
+                    { template => '%s', min => 0, label_extra_instance => 1 }
+                ]
             }
         }
     ];
@@ -77,22 +75,12 @@ sub new {
 
     $options{options}->add_options(arguments => {
         'instance:s@'       => { name => 'instance' },
-        'alias'             => { name => 'use_alias' },
-        'unknown-status:s'  => { name => 'unknown_status', default => '' },
-        'warning-status:s'  => { name => 'warning_status', default => '' },
-        'critical-status:s' => { name => 'critical_status', default => '%{status} !~ /OK/' }
+        'alias'             => { name => 'use_alias' }
     });
 
     return $self;
 }
 
-sub check_options {
-    my ($self, %options) = @_;
-    $self->SUPER::check_options(%options);
-
-    $self->change_macros(macros => ['unknown_status', 'warning_status', 'critical_status']);
-}
-
 sub manage_selection {
     my ($self, %options) = @_;