diff --git a/app/View/Elements/host_browser_menu.ctp b/app/View/Elements/host_browser_menu.ctp
index 4afa6fd404..dd30de1f29 100644
--- a/app/View/Elements/host_browser_menu.ctp
+++ b/app/View/Elements/host_browser_menu.ctp
@@ -24,10 +24,12 @@
 //	confirmation.
 
 ?>
-<a href="#" data-original-title="<?php echo __('Reset check time'); ?>" data-placement="bottom" rel="tooltip"
-   class="btn btn-default btn-sm" data-toggle="modal" data-target="#nag_command_reschedule">
+<?php if($this->request->params['action'] == 'browser' && $this->request->params['controller'] == 'hosts'): ?>
+<span data-original-title="<?php echo __('Reset check time'); ?>" data-placement="bottom" rel="tooltip"
+      class="btn btn-default btn-sm" data-toggle="modal" data-target="#nag_command_reschedule">
     <i class="fa fa-refresh fa-lg"></i>
-</a>
+</span>
+<?php endif; ?>
 <?php if ($this->Acl->hasPermission('view', 'documentations') && $host['Host']['host_type'] == GENERIC_HOST): ?>
     <span style="position:relative;">
         <a href="/documentations/view/<?php echo $host['Host']['uuid']; ?>/host"
diff --git a/app/View/Elements/service_browser_menu.ctp b/app/View/Elements/service_browser_menu.ctp
index fb78d08e38..fc1664036c 100644
--- a/app/View/Elements/service_browser_menu.ctp
+++ b/app/View/Elements/service_browser_menu.ctp
@@ -23,13 +23,11 @@
 //	License agreement and license key will be shipped with the order
 //	confirmation.
 ?>
-<?php
-echo $this->Form->create('nag_command', ['class' => 'pull-left']);
-echo $this->Form->input('satellite_id', ['type' => 'hidden', 'value' => $service['Host']['satellite_id']]); ?>
-    <span class="btn btn-default btn-sm nag_command submitRescheduleService" style="margin-right: 5px;">
-        <i class="fa fa-refresh fa-lg"></i>
-    </span>
-<?php echo $this->Form->end(); ?>
+<?php if($this->request->params['action'] == 'browser' && $this->request->params['controller'] == 'services'): ?>
+<span class="btn btn-default btn-sm nag_command submitRescheduleService">
+    <i class="fa fa-refresh fa-lg"></i>
+</span>
+<?php endif; ?>
 <?php if ($this->Acl->hasPermission('view', 'documentations') && $service['Service']['service_type'] == GENERIC_SERVICE): ?>
     <span style="position:relative;">
         <a href="/documentations/view/<?php echo $service['Service']['uuid']; ?>/service"
diff --git a/app/View/Services/browser.ctp b/app/View/Services/browser.ctp
index a0fe17fe58..6f50a58401 100644
--- a/app/View/Services/browser.ctp
+++ b/app/View/Services/browser.ctp
@@ -490,13 +490,11 @@
                                 </div>
                             <?php else: ?>
                                 <h5><?php
-                                    echo $this->Form->create('nag_command');
                                     echo $this->Form->input('satellite_id', ['type' => 'hidden', 'value' => $service['Host']['satellite_id']]); ?>
                                     <span class="nag_command submitRescheduleService">
                                         <i class="fa fa-refresh"></i>
                                         <?php echo __('Reset check time'); ?>
                                     </span>
-                                    <?php echo $this->Form->end(); ?>
                                 </h5>
                                 <h5><span class="nag_command" data-toggle="modal" data-target="#nag_command_passive_result"><i
                                                 class="fa fa-download"></i> <?php echo __('Passive transfer of check results') ?> </span><br/>