diff --git a/src/groups/create.js b/src/groups/create.js
index 353c0aca49..cf9b1eb784 100644
--- a/src/groups/create.js
+++ b/src/groups/create.js
@@ -9,7 +9,9 @@ var db = require('../database');
 module.exports = function(Groups) {
 
 	Groups.create = function(data, callback) {
-		var system = data.system === true || parseInt(data.system, 10) === 1 || data.name === 'administrators' || data.name === 'registered-users' || data.name === 'Global Moderators' || Groups.isPrivilegeGroup(data.name);
+		var system = data.system === true || parseInt(data.system, 10) === 1 ||
+			data.name === 'administrators' || data.name === 'registered-users' || data.name === 'Global Moderators' ||
+			Groups.isPrivilegeGroup(data.name);
 		var groupData;
 		var timestamp = data.timestamp || Date.now();
 
@@ -79,7 +81,7 @@ module.exports = function(Groups) {
 			return callback(new Error('[[error:group-name-too-short]]'));
 		}
 
-		if (name.length > (parseInt(meta.config.maximumGroupNameLength, 10) || 255)) {
+		if (!Groups.isPrivilegeGroup(data.name) && name.length > (parseInt(meta.config.maximumGroupNameLength, 10) || 255)) {
 			return callback(new Error('[[error:group-name-too-long]]'));
 		}
 
diff --git a/src/socket.io/admin/categories.js b/src/socket.io/admin/categories.js
index 8e24359e7a..ff2f8400b0 100644
--- a/src/socket.io/admin/categories.js
+++ b/src/socket.io/admin/categories.js
@@ -54,7 +54,7 @@ Categories.update = function(socket, data, callback) {
 };
 
 Categories.setPrivilege = function(socket, data, callback) {
-	if(!data) {
+	if (!data) {
 		return callback(new Error('[[error:invalid-data]]'));
 	}
 
@@ -72,7 +72,7 @@ Categories.getPrivilegeSettings = function(socket, cid, callback) {
 };
 
 Categories.copyPrivilegesToChildren = function(socket, cid, callback) {
-	categories.getCategories([cid], socket.uid, function(err, categories) {		
+	categories.getCategories([cid], socket.uid, function(err, categories) {
 		if (err) {
 			return callback(err);
 		}
diff --git a/src/socket.io/admin/groups.js b/src/socket.io/admin/groups.js
index c912008210..0088fbc5c8 100644
--- a/src/socket.io/admin/groups.js
+++ b/src/socket.io/admin/groups.js
@@ -1,8 +1,9 @@
 "use strict";
 
 var async = require('async');
-var groups = require('../../groups'),
-	Groups = {};
+var groups = require('../../groups');
+
+var Groups = {};
 
 Groups.create = function(socket, data, callback) {
 	if (!data) {