diff --git a/rhodecode/tests/functional/test_admin_users.py b/rhodecode/tests/functional/test_admin_users.py
--- a/rhodecode/tests/functional/test_admin_users.py
+++ b/rhodecode/tests/functional/test_admin_users.py
@@ -1,8 +1,12 @@
+from sqlalchemy.orm.exc import NoResultFound
+
 from rhodecode.tests import *
 from rhodecode.model.db import User, Permission
 from rhodecode.lib.auth import check_password
-from sqlalchemy.orm.exc import NoResultFound
 from rhodecode.model.user import UserModel
+from rhodecode.model import validators
+from rhodecode.lib import helpers as h
+
 
 class TestAdminUsersController(TestController):
 
@@ -24,26 +28,25 @@ class TestAdminUsersController(TestContr
         email = 'mail@mail.com'
 
         response = self.app.post(url('users'),
-                                 {'username':username,
-                                   'password':password,
-                                   'password_confirmation':password_confirmation,
-                                   'name':name,
-                                   'active':True,
-                                   'lastname':lastname,
-                                   'email':email})
+                             {'username': username,
+                               'password': password,
+                               'password_confirmation': password_confirmation,
+                               'name': name,
+                               'active': True,
+                               'lastname': lastname,
+                               'email': email})
 
+        self.checkSessionFlash(response, '''created user %s''' % (username))
 
-        self.assertTrue('''created user %s''' % (username) in
-                        response.session['flash'][0])
 
         new_user = self.Session.query(User).\
             filter(User.username == username).one()
 
-        self.assertEqual(new_user.username,username)
-        self.assertEqual(check_password(password, new_user.password),True)
-        self.assertEqual(new_user.name,name)
-        self.assertEqual(new_user.lastname,lastname)
-        self.assertEqual(new_user.email,email)
+        self.assertEqual(new_user.username, username)
+        self.assertEqual(check_password(password, new_user.password), True)
+        self.assertEqual(new_user.name, name)
+        self.assertEqual(new_user.lastname, lastname)
+        self.assertEqual(new_user.email, email)
 
         response.follow()
         response = response.follow()
@@ -57,16 +60,18 @@ class TestAdminUsersController(TestContr
         lastname = 'lastname'
         email = 'errmail.com'
 
-        response = self.app.post(url('users'), {'username':username,
-                                               'password':password,
-                                               'name':name,
-                                               'active':False,
-                                               'lastname':lastname,
-                                               'email':email})
+        response = self.app.post(url('users'), {'username': username,
+                                               'password': password,
+                                               'name': name,
+                                               'active': False,
+                                               'lastname': lastname,
+                                               'email': email})
 
-        self.assertTrue("""<span class="error-message">Invalid username</span>""" in response.body)
-        self.assertTrue("""<span class="error-message">Please enter a value</span>""" in response.body)
-        self.assertTrue("""<span class="error-message">An email address must contain a single @</span>""" in response.body)
+        msg = validators.ValidUsername(False, {})._messages['system_invalid_username']
+        msg = h.html_escape(msg % {'username': 'new_user'})
+        response.mustcontain("""<span class="error-message">%s</span>""" % msg)
+        response.mustcontain("""<span class="error-message">Please enter a value</span>""")
+        response.mustcontain("""<span class="error-message">An email address must contain a single @</span>""")
 
         def get_user():
             self.Session.query(User).filter(User.username == username).one()
@@ -94,13 +99,13 @@ class TestAdminUsersController(TestContr
         lastname = 'lastname'
         email = 'todeletemail@mail.com'
 
-        response = self.app.post(url('users'), {'username':username,
-                                               'password':password,
-                                               'password_confirmation':password,
-                                               'name':name,
-                                               'active':True,
-                                               'lastname':lastname,
-                                               'email':email})
+        response = self.app.post(url('users'), {'username': username,
+                                               'password': password,
+                                               'password_confirmation': password,
+                                               'name': name,
+                                               'active': True,
+                                               'lastname': lastname,
+                                               'email': email})
 
         response = response.follow()
 
@@ -111,7 +116,6 @@ class TestAdminUsersController(TestContr
         self.assertTrue("""successfully deleted user""" in
                         response.session['flash'][0])
 
-
     def test_delete_browser_fakeout(self):
         response = self.app.post(url('user', id=1),
                                  params=dict(_method='delete'))
@@ -127,7 +131,6 @@ class TestAdminUsersController(TestContr
         user = User.get_by_username(TEST_USER_ADMIN_LOGIN)
         response = self.app.get(url('edit_user', id=user.user_id))
 
-
     def test_add_perm_create_repo(self):
         self.log_user()
         perm_none = Permission.get_by_key('hg.create.none')
@@ -135,7 +138,6 @@ class TestAdminUsersController(TestContr
 
         user = User.get_by_username(TEST_USER_REGULAR_LOGIN)
 
-
         #User should have None permission on creation repository
         self.assertEqual(UserModel().has_perm(user, perm_none), False)
         self.assertEqual(UserModel().has_perm(user, perm_create), False)
@@ -159,7 +161,6 @@ class TestAdminUsersController(TestContr
 
         user = User.get_by_username(TEST_USER_REGULAR2_LOGIN)
 
-
         #User should have None permission on creation repository
         self.assertEqual(UserModel().has_perm(user, perm_none), False)
         self.assertEqual(UserModel().has_perm(user, perm_create), False)