=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties	2015-03-27 18:24:40 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties	2015-04-01 17:38:08 +0000
@@ -552,7 +552,7 @@
 account=Account
 update_user=Update user
 user_account=User Account
-user_name=User name
+user_name=Username
 old_password=Old password
 new_password=New password
 retype_new_password=Retype new password
@@ -885,7 +885,7 @@
 #-- Recovery page -------------------------------------------------------------#
 
 recover_success_message=Please check the email account which you registered for this username. We have sent you instructions on how to restore your password.	
-recover_error_message=Sorry, we were not able to restore your account. The user name might be invalid, your account might not permit restore or you might have entered an invalid email address for your account.
+recover_error_message=Sorry, we were not able to restore your account. The username might be invalid, your account might not permit restore or you might have entered an invalid email address for your account.
 
 #-- App Menu ------------------------------------------------------------------#