diff --git a/src/client.js b/src/client.js
index 058ff66b..2349ee5c 100644
--- a/src/client.js
+++ b/src/client.js
@@ -140,7 +140,7 @@ Client.prototype.find = function(channelId) {
 
 Client.prototype.connect = function(args) {
 	const client = this;
-	const nick = args.nick || "lounge-user";
+	const nick = args.nick || "thelounge";
 	let webirc = null;
 	let channels = [];
 
diff --git a/src/plugins/irc-events/error.js b/src/plugins/irc-events/error.js
index 6b67f8ae..9908a1fa 100644
--- a/src/plugins/irc-events/error.js
+++ b/src/plugins/irc-events/error.js
@@ -39,7 +39,7 @@ module.exports = function(irc, network) {
 		lobby.pushMessage(client, msg, true);
 
 		if (irc.connection.registered === false) {
-			const random = (data.nick || irc.user.nick) + Math.floor(10 + (Math.random() * 89));
+			const random = (data.nick || irc.user.nick) + Math.floor(Math.random() * 10);
 			irc.changeNick(random);
 		}
 
@@ -59,8 +59,7 @@ module.exports = function(irc, network) {
 		lobby.pushMessage(client, msg, true);
 
 		if (irc.connection.registered === false) {
-			const random = "i" + Math.random().toString(36).substr(2, 10); // 'i' so it never begins with a number
-			irc.changeNick(random);
+			irc.changeNick("thelounge" + Math.floor(Math.random() * 100));
 		}
 
 		client.emit("nick", {