diff --git a/src/server/components/auth.js b/src/server/components/auth.js
index 1106b4e7..bbe21089 100644
--- a/src/server/components/auth.js
+++ b/src/server/components/auth.js
@@ -348,8 +348,13 @@ module.exports = {
 	register: async function (msg) {
 		let credentials = msg.data;
 
-		if ((credentials.username === '') || (credentials.password === '')) {
+		if (credentials.username === '' || credentials.password === '') {
 			msg.callback(messages.login.allFields);
+
+			return;
+		} else if (credentials.username.length > 32) {
+			msg.callback(messages.login.maxUsernameLength);
+
 			return;
 		}
 
diff --git a/src/server/components/social.js b/src/server/components/social.js
index c7c60da0..fc0692a7 100644
--- a/src/server/components/social.js
+++ b/src/server/components/social.js
@@ -86,7 +86,7 @@ module.exports = {
 			return;
 
 		let source = cons.players.find(c => c.id === sourceId);
-		if (!source)
+		if (!source || !source.social)
 			return;
 
 		source.social.sendMessage('invite sent', 'color-yellowB');
diff --git a/src/server/misc/messages.js b/src/server/misc/messages.js
index 3dedcf04..21d08662 100644
--- a/src/server/misc/messages.js
+++ b/src/server/misc/messages.js
@@ -5,7 +5,8 @@ module.exports = {
 		allFields: 'please complete all fields',
 		illegal: 'illegal characters in username',
 		incorrect: 'invalid username and password',
-		charExists: 'character name is taken'
+		charExists: 'character name is taken',
+		maxUsernameLength: 'username may not be longer than 32 characters'
 	},
 	createCharacter: {
 		nameLength: 'name must be between 3 and 12 characters'