diff --git a/lib/Ravada/Front.pm b/lib/Ravada/Front.pm
index 62fba02a7..9263e4443 100644
--- a/lib/Ravada/Front.pm
+++ b/lib/Ravada/Front.pm
@@ -212,6 +212,7 @@ sub _get_clone_info($user, $base, $clone = Ravada::Front::Domain->open($base->{i
                         ,is_active => $clone->is_active
                         ,screenshot => $clone->_data('screenshot')
                         ,date_changed => $clone->_data('date_changed')
+                        ,autostart=> $clone->_data('autostart')
         };
 
     $c->{can_hibernate} = ($clone->is_active && !$clone->is_volatile);
diff --git a/public/js/admin.js b/public/js/admin.js
index 83d80fd11..c7f1f0ff3 100644
--- a/public/js/admin.js
+++ b/public/js/admin.js
@@ -556,15 +556,18 @@ ravadaApp.directive("solShowMachine", swMach)
         });
     };
 
-    $scope.action = function(target,action,machineId){
+    $scope.action = function(target,action,machine, confirmed){
         if (action === 'view-new-tab') {
-            window.open('/machine/view/' + machineId + '.html');
+            window.open('/machine/view/' + machine.id + '.html');
         }
         else if (action === 'view') {
-            window.location.assign('/machine/view/' + machineId + '.html');
+            window.location.assign('/machine/view/' + machine.id + '.html');
+        }
+        else if ((action === 'shutdown' || action === 'force_shutdown') && machine.autostart == 1 && !confirmed) {
+            $scope.open_modal('afc_', machine);
         }
         else {
-            $http.get('/'+target+'/'+action+'/'+machineId+'.json')
+            $http.get('/'+target+'/'+action+'/'+machine.id +'.json')
                .then(function(response) {
                    if(response.status == 300 || response.status == 403) {
                    console.error('Reponse error', response.status);
diff --git a/public/js/ravada.js b/public/js/ravada.js
index 408913582..5902fc149 100644
--- a/public/js/ravada.js
+++ b/public/js/ravada.js
@@ -200,12 +200,21 @@
                     $scope.host_shutdown = 0;
                     $scope.host_force_shutdown = 0;
                 } else if (action == 'shutdown' || action == 'hibernate' || action == 'force_shutdown' || action == 'reboot') {
-                    $scope.host_restore = 0;
-                    var id=machine.id;
-                    if (machine.clone) {
-                        id=machine.clone.id;
+                    if (machine.autostart == 1 && confirmed && (action == 'shutdown' || action == 'force_shutdown')) {
+                        action = tmp_action;
+                    }
+                    if (machine.autostart == 1 && (action == 'shutdown' || action == 'force_shutdown') && !confirmed) {
+                        $('#'+'afc_'+machine.id).modal({show:true})
+                        tmp_action = action;
+                    }
+                    else {
+                        $scope.host_restore = 0;
+                        var id=machine.id;
+                        if (machine.clone) {
+                            id=machine.clone.id;
+                        }
+                        $http.get( '/machine/'+action+'/'+id+'.json');
                     }
-                    $http.get( '/machine/'+action+'/'+id+'.json');
                 } else {
                     alert("unknown action "+action);
                 }
@@ -332,11 +341,13 @@
                     subscribe_list_bookings(url);
                 }
             };
+            $scope.tmp_action = null;
             $scope.only_public = false;
             $scope.toggle_only_public=function() {
                     $scope.only_public = !$scope.only_public;
             };
             $scope.startIntro = startIntro;
+
         };
 
         function singleMachinePageC($scope, $http, $interval, request, $location) {
@@ -498,15 +509,20 @@
               return string;
             };
 
-            $scope.action = function(target,action,machineId,params){
+            $scope.action = function(target,action,machine,params){
               if (action === 'view-new-tab') {
-                  window.open('/machine/view/' + machineId + '.html');
+                  window.open('/machine/view/' + machine.id + '.html');
               }
               else if (action === 'view') {
-                  window.location.assign('/machine/view/' + machineId + '.html');
+                  window.location.assign('/machine/view/' + machine.id + '.html');
               }
+                else if ((action === 'shutdown' || action === 'force_shutdown') && machine.autostart == 1 && !params.confirmed) {
+                    $('#shutdownModal').modal({show:true})
+                    $scope.tmp_action = action;
+                    $scope.force = params.force;
+                }
               else {
-                  $http.get('/'+target+'/'+action+'/'+machineId+'.json'+'?'+this.getQueryStringFromObject(params))
+                  $http.get('/'+target+'/'+action+'/'+machine.id+'.json'+'?'+this.getQueryStringFromObject(params))
                     .then(function() {
                     }, function(data,status) {
                           console.error('Repos error', status, data);
@@ -514,6 +530,8 @@
                     });
               }
             };
+            $scope.tmp_action = null;
+            $scope.force = null;
 
             var subscribe_requests = function(url) {
                 var ws = new WebSocket(url);
diff --git a/script/rvd_front b/script/rvd_front
index 8449f5132..33b8a79fd 100644
--- a/script/rvd_front
+++ b/script/rvd_front
@@ -4408,9 +4408,9 @@ sub shutdown_machine {
     if ($domain) {
         my $req;
         $req = Ravada::Request->force_shutdown_domain(id_domain => $domain->id, uid => $USER->id)
-            if ($c->param('force'));
+            if ($c->param('force') eq 'true');
         $req = Ravada::Request->shutdown_domain(id_domain => $domain->id, uid => $USER->id)
-            unless ($c->param('force'));
+            unless ($c->param('force') eq 'true');
         $id_req = $req->id if $req;
     }
     return $c->redirect_to('/machines') if $type eq 'html';
diff --git a/templates/main/admin_machines.html.ep b/templates/main/admin_machines.html.ep
index 8f1670d96..88b4d10ee 100644
--- a/templates/main/admin_machines.html.ep
+++ b/templates/main/admin_machines.html.ep
@@ -199,7 +199,7 @@
                                </div>
                                <div class="modal-footer" ng-show="machine.info">
                                  <button type="button" class="btn btn-secondary" data-dismiss="modal" ng-click="cancel_modal(machine,'is_base')"><%=l 'No' %></button>
-                                 <button type="button" class="btn btn-primary" ng-click="cancel_modal(machine);action('machine','remove_base',machine.id)" ng-show="!machine.is_base" data-dismiss="modal"><%=l 'Yes' %></button>
+                                 <button type="button" class="btn btn-primary" ng-click="cancel_modal(machine);action('machine','remove_base',machine)" ng-show="!machine.is_base" data-dismiss="modal"><%=l 'Yes' %></button>
                                  <button type="button" class="btn btn-primary" ng-click="cancel_modal();request('prepare_base',{ 'id_domain': machine.id, 'with_cd': with_cd })" ng-show="machine.is_base" data-dismiss="modal"><%=l 'Yes' %></button>
                                </div>
                              </div>
@@ -279,7 +279,7 @@
                     <td class="lgMachToggle" style="white-space:nowrap">
                       <div ng-hide="machine.is_locked||machine.is_base">
                         <button type="button" class="btn btn-success btn-sm"
-                         ng-click="action('machine','start',machine.id)"
+                         ng-click="action('machine','start',machine)"
                          ng-disabled="machine.is_active"
                          ng-show="machine.can_start"
                          title="<%=l 'Start' %>">
@@ -287,7 +287,7 @@
                         </button>
                         <button
                             type="button" class="btn btn-warning btn-sm"
-                         ng-click="action('machine','hibernate',machine.id)"
+                         ng-click="action('machine','hibernate',machine)"
                          ng-disabled="!machine.is_active"
                          ng-show="machine.can_hibernate"
                          title="<%=l 'Hibernate' %>">
@@ -295,14 +295,36 @@
                        </button>
                        <button
                             type="button" class="btn btn-danger btn-sm"
-                         ng-click="action('machine','shutdown',machine.id)"
+                            ng-click="action('machine','shutdown',machine, false)"
                          ng-disabled="!machine.is_active"
                          ng-show="machine.can_shutdown"
                          title="<%=l 'ShutDown' %>">
                           <i class="fa fa-power-off"></i>
                        </button>
+                        <!-- Pop-up window confirming the shutdown action and force shutdown. #issue 2185 -->
+                        <div id="afc_{{machine.id}}" class="modal fade">
+                            <div class="modal-dialog">
+                                <!-- Modal content-->
+                                <div class="modal-content">
+                                    <div class="modal-header">
+                                        <h4 class="modal-title"><%=l 'Shutdown confirmation' %></h4>
+                                        <button type="button" class="close" data-dismiss="modal">&times;</button>
+                                    </div>
+                                    <div class="modal-body">
+                                        <p><%=l 'Attention this machine has the autostart option activated !' %> </p>
+                                        <p><%=l 'Are you sure you want to shutdown the machine ?' %> </p>
+                                    </div>
+                                    <div class="modal-footer">
+                                        <button type="button" ng-click="action('machine', 'shutdown', machine, true)" class="btn btn-danger" data-dismiss="modal"><%=l 'Yes' %></button>
+                                        <button type="button" ng-click="cancel_modal(machine, undefined)" class="btn btn-secondary" data-dismiss="modal" 
+                                            ><%=l 'No' %></button>
+                                    </div>
+                                </div>
+
+                            </div>
+                        </div>
                        <button type="button" class="btn btn-primary btn-sm"
-                         ng-click="action('machine','view-new-tab',machine.id)"
+                         ng-click="action('machine','view-new-tab',machine)"
                          ng-show="machine.can_view"
                          title="<%=l 'View' %>">
                           <i class="fa fa-desktop"></i>
diff --git a/templates/main/list_bases_ng.html.ep b/templates/main/list_bases_ng.html.ep
index 2571c49e2..585f5a511 100644
--- a/templates/main/list_bases_ng.html.ep
+++ b/templates/main/list_bases_ng.html.ep
@@ -74,7 +74,7 @@
                         </button>
                         <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
                             <a ng-show="machine.clone.is_active || machine.is_active" class="dropdown-item"
-                                ng-click="machine.action=false;action(machine,'shutdown')">
+                                ng-click="machine.action=false;action(machine,'shutdown', false)" 
                                 <i class="fa fa-angle-double-down" aria-hidden="true"></i>&nbsp;<%=l 'Shutdown'%></a>
                             <a ng-show="machine.clone.is_active || machine.is_active" class="dropdown-item"
                                 ng-click="machine.action=false;action(machine,'reboot')">
@@ -83,13 +83,35 @@
                                 ng-click="machine.action=false;action(machine,'hibernate')">
                                 <i class="fa fa-snowflake" aria-hidden="true"></i>&nbsp;<%=l 'Hibernate' %></a>
                             <a ng-show="machine.is_active || machine.clone.is_active" class="dropdown-item"
-                                ng-click="machine.action=false;action(machine,'force_shutdown')">
+                                ng-click="machine.action=false;action(machine,'force_shutdown', false)">
                                 <i class="fa fa-times" aria-hidden="true"></i>&nbsp;<%=l 'Poweroff' %></a>
                             <a ng-show="machine.clone.can_remove" class="dropdown-item"
                                 ng-click="host_restore=machine.clone.id">
                                 <i class="fa fa-trash" aria-hidden="true"></i>&nbsp;<%=l 'Restore' %></a>
                         </div>
                     </div>
+                <!-- Pop-up window confirming the shutdown action and force shutdown. #issue 2185 -->
+                <div id="afc_{{machine.id}}" class="modal fade">
+                    <div class="modal-dialog">
+                        <!-- Modal content-->
+                        <div class="modal-content">
+                            <div class="modal-header">
+                                <h4 class="modal-title"><%=l 'Shutdown confirmation' %></h4>
+                                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                            </div>
+                            <div class="modal-body">
+                                <p><%=l 'Attention this machine has the autostart option activated !' %> </p>
+                                <p><%=l 'Are you sure you want to shutdown the machine ?' %> </p>
+                            </div>
+                            <div class="modal-footer">
+                                <button type="button" ng-click="action(machine, 'shutdown', true)" class="btn btn-danger" data-dismiss="modal"><%=l 'Yes' %></button>
+                                <button type="button" class="btn btn-secondary" data-dismiss="modal" 
+                                    ><%=l 'No' %></button>
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
                 <a type="button" class="btn btn-primary text-white"
                     ng-show="!machine.is_base && !machine.action && !machine.is_active && machine.can_prepare_base"
                     ng-click="machine.action='prepare'"
diff --git a/templates/main/vm_actions.html.ep b/templates/main/vm_actions.html.ep
index a8af5d238..bdb97bfc3 100644
--- a/templates/main/vm_actions.html.ep
+++ b/templates/main/vm_actions.html.ep
@@ -2,7 +2,7 @@
   <span ng-show="!showmachine"><i class="fas fa-sync-alt fa-spin"></i></span>
   <div ng-show="!showmachine || showmachine.can_start">
     <button type="button" class="btn btn-success btn-sm"
-     ng-click="action('machine','start',showmachine.id)"
+     ng-click="action('machine','start',showmachine)"
      ng-disabled="!showmachine || showmachine.is_active"
      title="<%=l 'Start' %>">
      <i class="fa fa-play"></i>
@@ -13,7 +13,7 @@
 
   <div ng-show="!showmachine || showmachine.can_view">
     <button type="button" class="btn btn-primary btn-sm"
-     ng-click="action('machine','view',showmachine.id)"
+     ng-click="action('machine','view',showmachine)"
      ng-disabled="!showmachine"
      title="<%=l 'View' %>">
      <i class="fa fa-desktop"></i>
@@ -24,7 +24,7 @@
 
   <div ng-show="!showmachine || showmachine.can_hibernate">
     <button type="button" class="btn btn-warning btn-sm"
-     ng-click="action('machine','hibernate',showmachine.id)"
+     ng-click="action('machine','hibernate',showmachine)"
      ng-disabled="showmachine && !showmachine.is_active"
      title="<%=l 'Hibernate' %>">
       <i class="fa fa-pause"></i>
@@ -35,7 +35,7 @@
 
   <div ng-show="showmachine.can_shutdown">
     <button type="button" class="btn btn-danger btn-sm"
-     ng-click="action('machine','shutdown',showmachine.id)"
+     ng-click="action('machine','shutdown',showmachine, {force: false, confirmed: false})"
      ng-disabled="!showmachine || !showmachine.is_active"
      title="<%=l 'ShutDown' %>">
       <i class="fa fa-power-off"></i>
@@ -46,7 +46,7 @@
 
   <div ng-show="showmachine.can_shutdown">
     <button type="button" class="btn btn-danger btn-sm"
-     ng-click="action('machine','shutdown',showmachine.id, { force: true })"
+     ng-click="action('machine','shutdown',showmachine, { force: true, confirmed: false})"
      ng-disabled="!showmachine.is_active"
      title="<%=l 'Force ShutDown' %>">
       <i class="fa fa-power-off"></i>
@@ -57,7 +57,7 @@
 
   <div ng-show="!showmachine || showmachine.can_reboot">
     <button type="button" class="btn btn-danger btn-sm"
-     ng-click="action('machine','reboot',showmachine.id)"
+     ng-click="action('machine','reboot',showmachine, {force: false})"
      ng-disabled="!showmachine || !showmachine.is_active"
      title="<%=l 'Reboot' %>">
       <i class="fa fa-redo"></i>
@@ -68,7 +68,7 @@
 
   <div ng-show="showmachine.can_reboot">
     <button type="button" class="btn btn-danger btn-sm"
-     ng-click="action('machine','reboot',showmachine.id, { force: true })"
+     ng-click="action('machine','reboot',showmachine, { force: true })"
      ng-disabled="!showmachine.is_active"
      title="<%=l 'Force Reboot' %>">
       <i class="fa fa-redo"></i>
@@ -76,6 +76,7 @@
     <span><%=l 'Force Reboot' %></span>
     <br><br>
   </div>
+%= include 'main/vm_actions_shutdown_modal'
 
 </div>
 
diff --git a/templates/main/vm_actions_shutdown_modal.html.ep b/templates/main/vm_actions_shutdown_modal.html.ep
new file mode 100644
index 000000000..87d7bb668
--- /dev/null
+++ b/templates/main/vm_actions_shutdown_modal.html.ep
@@ -0,0 +1,20 @@
+<div id="shutdownModal" class="modal fade">
+    <div class="modal-dialog">
+        <!-- Modal content-->
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title"><%=l 'Shutdown confirmation' %></h4>
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+            </div>
+            <div class="modal-body">
+                <p><%=l 'Attention this machine has the autostart option activated !' %> </p>
+                <p><%=l 'Are you sure you want to shutdown the machine ?' %> </p>
+            </div>
+            <div class="modal-footer">
+                <button type="button" ng-click="action('machine', tmp_action, showmachine, {force, confirmed:true})" class="btn btn-danger" data-dismiss="modal"><%=l 'Yes' %></button>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal" 
+                    ><%=l 'No' %></button>
+            </div>
+        </div>
+    </div>
+</div>