diff --git a/loader.js b/loader.js
index d8393c55f7..63027b1603 100644
--- a/loader.js
+++ b/loader.js
@@ -8,14 +8,10 @@ var	fork = require('child_process').fork,
 
 		nbb.on('message', function(cmd) {
 			if (cmd === 'nodebb:restart') {
-				if (process.env.NODE_ENV !== 'development') {
-					nbb.on('exit', function() {
-						start();
-					});
-					nbb.kill();
-				} else {
-					console.log('[app] Development Mode is on, restart aborted.');
-				}
+				nbb.on('exit', function() {
+					start();
+				});
+				nbb.kill();
 			}
 		});
 	}
diff --git a/public/src/forum/admin/plugins.js b/public/src/forum/admin/plugins.js
index 9386f8390f..2cda33fb4e 100644
--- a/public/src/forum/admin/plugins.js
+++ b/public/src/forum/admin/plugins.js
@@ -15,14 +15,6 @@ define(function() {
 					pluginTgl = $('.plugins li[data-plugin-id="' + status.id + '"] button');
 					pluginTgl.html('<i class="fa fa-power-off"></i> ' + (status.active ? 'Dea' : 'A') + 'ctivate');
 					pluginTgl.toggleClass('btn-warning', status.active).toggleClass('btn-success', !status.active);
-
-					app.alert({
-						alert_id: 'plugin_toggled_' + status.id,
-						title: 'Plugin ' + (status.active ? 'Enabled' : 'Disabled'),
-						message: 'You may need to restart NodeBB in order for these changes to be reflected.',
-						type: 'warning',
-						timeout: 5000
-					})
 				});
 			} else {
 				pluginsList.append('<li><p><i>No plugins found.</i></p></li>');
diff --git a/public/src/forum/admin/themes.js b/public/src/forum/admin/themes.js
index 6207b98fff..d8cc89bbd8 100644
--- a/public/src/forum/admin/themes.js
+++ b/public/src/forum/admin/themes.js
@@ -21,14 +21,6 @@ define(['forum/admin/settings'], function(Settings) {
 								type: themeType,
 								id: themeId,
 								src: cssSrc
-							}, function(err) {
-								app.alert({
-									alert_id: 'admin:theme',
-									type: 'success',
-									title: 'Theme Changed',
-									message: 'You have successfully changed your NodeBB\'s theme. Please restart to see the changes.',
-									timeout: 2500
-								});
 							});
 						break;
 					}
diff --git a/src/socket.io/admin.js b/src/socket.io/admin.js
index 3f674f2d65..f4d11f6d4b 100644
--- a/src/socket.io/admin.js
+++ b/src/socket.io/admin.js
@@ -274,12 +274,16 @@ SocketAdmin.themes.set = function(socket, data, callback) {
 	if(!data) {
 		return callback(new Error('invalid data'));
 	}
-	meta.themes.set(data, callback);
+	meta.themes.set(data, function() {
+		callback();
+		meta.restart()
+	});
 };
 
 SocketAdmin.plugins.toggle = function(socket, plugin_id) {
 	plugins.toggleActive(plugin_id, function(status) {
 		socket.emit('admin.plugins.toggle', status);
+		meta.restart();
 	});
 };