diff --git a/dashboard/src/views/services.html b/dashboard/src/views/services.html
index b40d7f709..908151af5 100644
--- a/dashboard/src/views/services.html
+++ b/dashboard/src/views/services.html
@@ -116,8 +116,9 @@
                   </td>
                   <td class="text-right no-wrap" style="vertical-align: bottom">
                     <button class="btn btn-xs btn-default" ng-click="serviceConfigure.show(service)" uib-tooltip="{{ 'services.configureActionTooltip' | tr }}" ng-disabled="service.status === 'disabled' || !service.config.memoryLimit"><i class="fa fa-pencil-alt"></i></button>
-                    <button class="btn btn-xs btn-default" ng-click="restartService(service.name)" uib-tooltip="{{ 'services.restartActionTooltip' | tr }}" ng-disabled="service.status === 'disabled'"><i class="fa fa-sync-alt" ng-class="{ 'fa-spin': service.status === 'starting' && !service.config.recoveryMode }"></i></button>
-                    <a class="btn btn-xs btn-default" ng-href="{{ '/frontend/logs.html?id=' + service.name }}" target="_blank" uib-tooltip="{{ 'logs.title' | tr }}" ng-disabled="service.status === 'disabled'"><i class="fa fa-file-alt"></i></a>
+                    <!-- restart is always clickable so that a user can rebuild mongodb in disabled state when using VMs where CPU flags can be dynamically changed -->
+                    <button class="btn btn-xs btn-default" ng-click="restartService(service.name)" uib-tooltip="{{ 'services.restartActionTooltip' | tr }}"><i class="fa fa-sync-alt" ng-class="{ 'fa-spin': service.status === 'starting' && !service.config.recoveryMode }"></i></button>
+                    <a class="btn btn-xs btn-default" ng-href="{{ service.status === 'disabled' ? '' : ('/frontend/logs.html?id=' + service.name) }}" target="_blank" uib-tooltip="{{ 'logs.title' | tr }}" ng-disabled="service.status === 'disabled'"><i class="fa fa-file-alt"></i></a>
                   </td>
                 </tr>
                 <tr ng-show="hasRedisServices" ng-click="redisServicesExpanded = !redisServicesExpanded" class="hand">
diff --git a/dashboard/src/views/services.js b/dashboard/src/views/services.js
index 6580ecd56..a99c8e84b 100644
--- a/dashboard/src/views/services.js
+++ b/dashboard/src/views/services.js
@@ -53,7 +53,10 @@ angular.module('Application').controller('ServicesController', ['$scope', '$loca
 
                 return;
             }
-            if (error) return Client.error(error);
+            if (error) {
+                refresh(serviceName);
+                return Client.error(error);
+            }
 
             // show "busy" indicator for 3 seconds to show some ui activity
             setTimeout(function () { waitForActive(serviceName); }, 3000);
diff --git a/src/services.js b/src/services.js
index a6df09023..f303b9af0 100644
--- a/src/services.js
+++ b/src/services.js
@@ -1497,7 +1497,7 @@ async function restorePostgreSql(app, options) {
 
 async function hasAVX() {
     // mongodb 5 and above requires AVX
-    const [error] = await safe(shell.exec('grep -q avx /proc/cpuinfo', {}));
+    const [error] = await safe(shell.exec('hasAVX', 'grep -q avx /proc/cpuinfo', {}));
     return !error;
 }
 
@@ -1677,10 +1677,7 @@ async function statusMongodb() {
 }
 
 async function restartMongodb() {
-    if (!await hasAVX()) {
-        debug('restartMongodb: skipping restart, CPU has no AVX support');
-        return;
-    }
+    if (!await hasAVX()) throw new BoxError(BoxError.ADDONS_ERROR, 'MongoDB is disabled. CPU has no AVX support');
 
     return await docker.restartContainer('mongodb');
 }