diff --git a/server/methods/getUsernameSuggestion.coffee b/server/methods/getUsernameSuggestion.coffee
index 152fc5ca966f..a69774838d4d 100644
--- a/server/methods/getUsernameSuggestion.coffee
+++ b/server/methods/getUsernameSuggestion.coffee
@@ -5,8 +5,7 @@ slug = (text) ->
 usernameIsAvaliable = (username) ->
 	if username.length < 1
 		return false
-
-	return not Meteor.users.findOne({username: username})?
+	return not Meteor.users.findOne({username: {$regex : new RegExp(username, "i") }})
 
 @generateSuggestion = (user) ->
 	usernames = []
diff --git a/server/methods/setUsername.coffee b/server/methods/setUsername.coffee
index 7a405d07f479..040b20625885 100644
--- a/server/methods/setUsername.coffee
+++ b/server/methods/setUsername.coffee
@@ -13,7 +13,7 @@ Meteor.methods
 		if not usernameIsAvaliable username
 			throw new Meteor.Error 'username-unavaliable'
 
-		if not /^[0-9a-z-_.]+$/.test username
+		if not /^[0-9a-zA-Z-_.]+$/.test username
 			throw new Meteor.Error 'username-invalid'
 
 		if not user.username?
@@ -58,5 +58,4 @@ slug = (text) ->
 usernameIsAvaliable = (username) ->
 	if username.length < 1
 		return false
-
-	return not Meteor.users.findOne({username: username})?
+	return not Meteor.users.findOne({username: {$regex : new RegExp(username, "i") }})