diff --git a/rhodecode/model/forms.py b/rhodecode/model/forms.py
--- a/rhodecode/model/forms.py
+++ b/rhodecode/model/forms.py
@@ -264,7 +264,7 @@ def UniqSystemEmail(old_data):
                 try:
                     user = sa.query(User).filter(User.email == value).scalar()
                     if user:
-                        raise formencode.Invalid(_("That e-mail address is already taken") ,
+                        raise formencode.Invalid(_("This e-mail address is already taken") ,
                                                  value, state)
                 finally:
                     meta.Session.remove()
@@ -280,7 +280,7 @@ class ValidSystemEmail(formencode.valida
         try:
             user = sa.query(User).filter(User.email == value).scalar()
             if  user is None:
-                raise formencode.Invalid(_("That e-mail address doesn't exist.") ,
+                raise formencode.Invalid(_("This e-mail address doesn't exist.") ,
                                          value, state)
         finally:
             meta.Session.remove()
diff --git a/rhodecode/tests/functional/test_admin_settings.py b/rhodecode/tests/functional/test_admin_settings.py
--- a/rhodecode/tests/functional/test_admin_settings.py
+++ b/rhodecode/tests/functional/test_admin_settings.py
@@ -97,7 +97,7 @@ class TestAdminSettingsController(TestCo
                                                             email=new_email,))
         print response
 
-        assert 'That e-mail address is already taken' in response.body, 'Missing error message about existing email'
+        assert 'This e-mail address is already taken' in response.body, 'Missing error message about existing email'
 
 
     def test_my_account_update_err(self):
diff --git a/rhodecode/tests/functional/test_login.py b/rhodecode/tests/functional/test_login.py
--- a/rhodecode/tests/functional/test_login.py
+++ b/rhodecode/tests/functional/test_login.py
@@ -89,7 +89,7 @@ class TestLoginController(TestController
                                              'lastname':'test'})
 
         assert response.status == '200 OK', 'Wrong response from register page got %s' % response.status
-        assert 'That e-mail address is already taken' in response.body
+        assert 'This e-mail address is already taken' in response.body
 
     def test_register_err_same_email_case_sensitive(self):
         response = self.app.post(url(controller='login', action='register'),
@@ -100,7 +100,7 @@ class TestLoginController(TestController
                                              'name':'test',
                                              'lastname':'test'})
         assert response.status == '200 OK', 'Wrong response from register page got %s' % response.status
-        assert 'That e-mail address is already taken' in response.body
+        assert 'This e-mail address is already taken' in response.body
 
     def test_register_err_wrong_data(self):
         response = self.app.post(url(controller='login', action='register'),
@@ -200,7 +200,7 @@ class TestLoginController(TestController
         response = self.app.post(url(controller='login', action='password_reset'),
                                             {'email':'marcin@wrongmail.org', })
 
-        assert "That e-mail address doesn't exist" in response.body, 'Missing error message about wrong email'
+        assert "This e-mail address doesn't exist" in response.body, 'Missing error message about wrong email'
 
     def test_forgot_password(self):
         response = self.app.get(url(controller='login', action='password_reset'))