diff --git a/public/src/client/search.js b/public/src/client/search.js
index f2d658edf7..af6e0ff163 100644
--- a/public/src/client/search.js
+++ b/public/src/client/search.js
@@ -188,15 +188,18 @@ define('forum/search', ['search', 'autocomplete', 'storage'], function (searchMo
 			confirmKeys: [13, 44],
 			trimValue: true,
 		});
-		autocomplete.user(userEl.siblings('.bootstrap-tagsinput').find('input'));
+		if (app.user.privileges['search:users']) {
+			autocomplete.user(userEl.siblings('.bootstrap-tagsinput').find('input'));
+		}
 
 		var tagEl = $('#has-tags');
 		tagEl.tagsinput({
 			confirmKeys: [13, 44],
 			trimValue: true,
 		});
-
-		autocomplete.tag(tagEl.siblings('.bootstrap-tagsinput').find('input'));
+		if (app.user.privileges['search:tags']) {
+			autocomplete.tag(tagEl.siblings('.bootstrap-tagsinput').find('input'));
+		}
 	}
 
 	return Search;
diff --git a/src/socket.io/user/profile.js b/src/socket.io/user/profile.js
index 0886b1e24c..4519d46bad 100644
--- a/src/socket.io/user/profile.js
+++ b/src/socket.io/user/profile.js
@@ -162,7 +162,7 @@ module.exports = function (SocketUser) {
 			throw new Error('[[error:invalid-uid]]');
 		}
 
-		if (!data || !data.uid) {
+		if (!data || !(parseInt(data.uid, 10) > 0)) {
 			throw new Error('[[error:invalid-data]]');
 		}