diff --git a/public/language/en-GB/admin/general/dashboard.json b/public/language/en-GB/admin/general/dashboard.json
index 9f1c6d8a4e..3b4ed54444 100644
--- a/public/language/en-GB/admin/general/dashboard.json
+++ b/public/language/en-GB/admin/general/dashboard.json
@@ -36,9 +36,10 @@
 	"search-plugin-tooltip": "Install a search plugin from the plugin page in order to activate search functionality",
 
 	"control-panel": "System Control",
-	"reload": "Reload",
-	"restart": "Restart",
-	"restart-warning": "Reloading or Restarting your NodeBB will drop all existing connections for a few seconds.",
+	"reload": "Restart",
+	"restart": "Rebuild & Restart",
+	"restart-warning": "Rebuilding or Restarting your NodeBB will drop all existing connections for a few seconds.",
+	"restart-disabled": "Rebuilding and Restarting your NodeBB has been disabled as you do not seem to be running it via the appropriate daemon.",
 	"maintenance-mode": "Maintenance Mode",
 	"maintenance-mode-title": "Click here to set up maintenance mode for NodeBB",
 	"realtime-chart-updates": "Realtime Chart Updates",
diff --git a/src/controllers/admin/dashboard.js b/src/controllers/admin/dashboard.js
index 8b1751d2a6..b5ae760727 100644
--- a/src/controllers/admin/dashboard.js
+++ b/src/controllers/admin/dashboard.js
@@ -48,6 +48,7 @@ dashboardController.get = function (req, res, next) {
 				version: nconf.get('version'),
 				notices: results.notices,
 				stats: results.stats,
+				canRestart: !!process.send,
 			});
 		},
 	], next);
diff --git a/src/views/admin/general/dashboard.tpl b/src/views/admin/general/dashboard.tpl
index 46f7e236dd..3090e2dc8b 100644
--- a/src/views/admin/general/dashboard.tpl
+++ b/src/views/admin/general/dashboard.tpl
@@ -101,13 +101,15 @@
 			<div class="panel-heading">[[admin/general/dashboard:control-panel]]</div>
 			<div class="panel-body text-center">
 				<p>
-					<div class="btn-group">
-						<button class="btn btn-warning reload">[[admin/general/dashboard:reload]]</button>
-						<button class="btn btn-danger restart">[[admin/general/dashboard:restart]]</button>
-					</div>
+					<button class="btn btn-block btn-warning reload"<!-- IF !canRestart --> disabled<!-- END -->>[[admin/general/dashboard:reload]]</button>
+					<button class="btn btn-block btn-danger restart"<!-- IF !canRestart --> disabled<!-- END -->>[[admin/general/dashboard:restart]]</button>
 				</p>
-				<p class="help-block">
+				<p class="<!-- IF canRestart -->help-block<!-- ELSE -->alert alert-warning<!-- END -->">
+					<!-- IF canRestart -->
 					[[admin/general/dashboard:restart-warning]]
+					<!-- ELSE -->
+					[[admin/general/dashboard:restart-disabled]]
+					<!-- END -->
 				</p>
 				<p>
 					<a href="{config.relative_path}/admin/settings/advanced" class="btn btn-info btn-block" data-placement="bottom" data-toggle="tooltip" title="[[admin/general/dashboard:maintenance-mode-title]]">[[admin/general/dashboard:maintenance-mode]]</a>