--- a/kallithea/lib/auth_modules/auth_crowd.py	Tue Jan 12 11:44:48 2016 +0100
+++ b/kallithea/lib/auth_modules/auth_crowd.py	Wed Jan 20 01:41:02 2016 +0100
@@ -119,14 +119,14 @@
         """Authenticate a user against crowd. Returns brief information about
         the user."""
         url = ("%s/rest/usermanagement/%s/authentication?username=%s"
-               % (self._uri, self._version, username))
+               % (self._uri, self._version, urllib2.quote(username)))
         body = json.dumps({"value": password})
         return self._request(url, body)
 
     def user_groups(self, username):
         """Retrieve a list of groups to which this user belongs."""
         url = ("%s/rest/usermanagement/%s/user/group/nested?username=%s"
-               % (self._uri, self._version, username))
+               % (self._uri, self._version, urllib2.quote(username)))
         return self._request(url)
 
 
@@ -222,7 +222,7 @@
         lastname = getattr(userobj, 'lastname', '')
 
         user_data = {
-            'username': username,
+            'username': crowd_user["name"] or username,
             'firstname': crowd_user["first-name"] or firstname,
             'lastname': crowd_user["last-name"] or lastname,
             'groups': crowd_user["groups"],