diff --git a/public/js/lib/templates.js b/public/js/lib/templates.js
index d5ced02..a752492 100644
--- a/public/js/lib/templates.js
+++ b/public/js/lib/templates.js
@@ -104,7 +104,8 @@ define({
 	server: {
 		person_joined: 			'A person joined this room.',
 		person_left: 			'A person left this room.',
-		person_count: 			'There is {payload} person(s) in this room, including you.',
+		person_count: 			'There are {payload} people in this room, including you.',
+		person_single:			'You are the only person in this room.',
 		command_failed: 		'Server command failed, you\'re probably trying to du something bogus.',
 		bogus: 					'Received a bogus message from server.'
 	},
@@ -112,4 +113,4 @@ define({
 	client: {
 		title: 					'Cryptalk - Offline'
 	}
-});
\ No newline at end of file
+});
diff --git a/server.js b/server.js
index ad99050..2c66989 100644
--- a/server.js
+++ b/server.js
@@ -53,7 +53,11 @@ io.on('connection', function(socket) {
 	socket.on('room:count', function () {
 		if( socket.current_room !== undefined ) {
 			var clientsList = io.sockets.adapter.rooms[socket.current_room];
-			socket.emit('message:server', {msg:'person_count', payload: clientsList.length } );
+			if( clientsList.length > 1) {
+				socket.emit('message:server', {msg:'person_count', payload: clientsList.length } );
+			} else {
+				socket.emit('message:server', {msg:'person_single'} );
+			}
 		} else {
 			socket.emit('message:server', {msg:'command_failed'} );
 		}
@@ -99,4 +103,4 @@ io.on('connection', function(socket) {
 		}
 	});
 
-});
\ No newline at end of file
+});