diff --git a/doc/src/user/en/16-ldap-authentication.rst b/doc/src/user/en/16-ldap-authentication.rst
index 604951906..7e7810873 100644
--- a/doc/src/user/en/16-ldap-authentication.rst
+++ b/doc/src/user/en/16-ldap-authentication.rst
@@ -40,8 +40,8 @@ Authentication
 ==============
 
 Here can be configured the property in LDAP nodes where should be found the
-given login name. The property *UserId* must be filled with the name of the
-property where the login name is stored in LDAP.
+given username. The property *UserId* must be filled with the name of the
+property where the username is stored in LDAP.
 
 The checkbox *Save passwords in database* when it is checked, means that the
 password is stored also in LibrePlan database. In this way, if LDAP is offline
diff --git a/libreplan-business/src/main/java/org/libreplan/business/users/daos/IUserDAO.java b/libreplan-business/src/main/java/org/libreplan/business/users/daos/IUserDAO.java
index cf78cfb0b..ef2fca20b 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/users/daos/IUserDAO.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/users/daos/IUserDAO.java
@@ -39,34 +39,36 @@ import org.libreplan.business.users.entities.User;
 public interface IUserDAO extends IGenericDAO<User, Long>{
 
     /**
-     * NOTE: Login name comparison is case-insensitive.
+     * NOTE: Username comparison is case-insensitive.
      */
     public User findByLoginName(String loginName)
         throws InstanceNotFoundException;
 
     /**
-     * NOTE: Login name comparison is case-insensitive, and the method is
-     * executed in another transaction.
+     * NOTE: Username comparison is case-insensitive, and the method is executed
+     * in another transaction.
      */
     public User findByLoginNameAnotherTransaction(String loginName)
         throws InstanceNotFoundException;
 
     /**
-     * NOTE: Login name comparison is case-insensitive.
+     * NOTE: Username comparison is case-insensitive.
      */
     public boolean existsByLoginName(String loginName);
 
     /**
-     * NOTE: Login name comparison is case-insensitive, and the method is
-     * executed in another transaction.
+     * NOTE: Username comparison is case-insensitive, and the method is executed
+     * in another transaction.
      */
     public boolean existsByLoginNameAnotherTransaction(String loginName);
 
     /**
      * Finds a User entity by its loginName, among those with the disabled
      * attribute set to false.
-     * @param loginName loginName to perform the search. NOTE: Login name
-     * comparison is case-insensitive.
+     *
+     * @param loginName
+     *            loginName to perform the search. NOTE: Username comparison is
+     *            case-insensitive.
      * @return a {@link User} object.
      * @throws InstanceNotFoundException
      */
diff --git a/libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java b/libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java
index 065d80a8c..85969ce1a 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java
@@ -110,7 +110,7 @@ public class User extends BaseEntity implements IHumanIdentifiable{
         return create(new User(loginName, password, email));
     }
 
-    @NotEmpty(message = "login name not specified")
+    @NotEmpty(message = "username not specified")
     public String getLoginName() {
         return loginName;
     }
@@ -208,7 +208,7 @@ public class User extends BaseEntity implements IHumanIdentifiable{
         return isInRole(UserRole.ROLE_ADMINISTRATION);
     }
 
-    @AssertTrue(message = "login name is already being used by another user")
+    @AssertTrue(message = "username is already being used by another user")
     public boolean checkConstraintUniqueLoginName() {
 
         IUserDAO userDAO = Registry.getUserDAO();
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/UserBandboxFinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/UserBandboxFinder.java
index ecc165f7d..8f9070662 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/UserBandboxFinder.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/UserBandboxFinder.java
@@ -44,7 +44,7 @@ public class UserBandboxFinder extends BandboxFinder implements IBandboxFinder {
     @Autowired
     private IUserDAO userDAO;
 
-    private final String headers[] = { _("Login name"), _("Full name") };
+    private final String headers[] = { _("Username"), _("Full name") };
 
     /**
      * Forces to mark the string as needing translation
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/bootstrap/MandatoryUser.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/bootstrap/MandatoryUser.java
index ff5bfcd4d..a2f5a7ef9 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/users/bootstrap/MandatoryUser.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/bootstrap/MandatoryUser.java
@@ -34,7 +34,7 @@ import org.libreplan.business.common.exceptions.InstanceNotFoundException;
 import org.libreplan.business.users.entities.UserRole;
 
 /**
- * It enumerates the mandatory users (login names) for running the application.<br />
+ * It enumerates the mandatory users (usernames) for running the application.<br />
  *
  * <code>ADMIN</code> user will be always enabled, however <code>USER</code>,
  * <code>WSREADER</code> and <code>WSWRITER</code> could be disabled in
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/services/DBUserDetailsService.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/services/DBUserDetailsService.java
index 3ea8f0c9b..472e75fb5 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/users/services/DBUserDetailsService.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/services/DBUserDetailsService.java
@@ -63,8 +63,8 @@ public class DBUserDetailsService implements UserDetailsService {
         try {
             user = userDAO.findByLoginName(loginName);
         } catch (InstanceNotFoundException e) {
-            throw new UsernameNotFoundException(_("User with login name " +
-                "'{0}': not found", loginName));
+            throw new UsernameNotFoundException(_(
+                    "User with username '{0}': not found", loginName));
         }
 
         Scenario scenario = user.getLastConnectedScenario();
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/services/IDBPasswordEncoderService.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/services/IDBPasswordEncoderService.java
index 852b973a1..911c94b6b 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/users/services/IDBPasswordEncoderService.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/services/IDBPasswordEncoderService.java
@@ -36,7 +36,7 @@ public interface IDBPasswordEncoderService {
 
     /**
      * Encodes a clear password. The second parameter (which must be the
-     * login name) may be used as a salt.
+     * username) may be used as a salt.
      */
     public String encodePassword(String clearPassword, String loginName);
 
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/services/LDAPUserDetailsService.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/services/LDAPUserDetailsService.java
index 7e784c8a1..83ebc325f 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/users/services/LDAPUserDetailsService.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/services/LDAPUserDetailsService.java
@@ -62,7 +62,7 @@ public class LDAPUserDetailsService implements UserDetailsService {
         try {
             user = userDAO.findByLoginName(loginName);
         } catch (InstanceNotFoundException e) {
-            throw new UsernameNotFoundException(_("User with login name "
+            throw new UsernameNotFoundException(_("User with username "
                     + "'{0}': not found", loginName));
         }
 
diff --git a/libreplan-webapp/src/main/webapp/resources/worker/_edition.zul b/libreplan-webapp/src/main/webapp/resources/worker/_edition.zul
index 5f62c6eb2..18e0d5001 100644
--- a/libreplan-webapp/src/main/webapp/resources/worker/_edition.zul
+++ b/libreplan-webapp/src/main/webapp/resources/worker/_edition.zul
@@ -137,7 +137,7 @@
                                 </columns>
                                 <rows>
                                     <row>
-                                        <label value="${i18n:_('Login name')}" />
+                                        <label value="${i18n:_('Username')}" />
                                         <textbox id="loginName" width="300px" />
                                     </row>
                                     <row>
diff --git a/libreplan-webapp/src/main/webapp/users/_editUser.zul b/libreplan-webapp/src/main/webapp/users/_editUser.zul
index 1f3ffe10d..97bf9ceb9 100644
--- a/libreplan-webapp/src/main/webapp/users/_editUser.zul
+++ b/libreplan-webapp/src/main/webapp/users/_editUser.zul
@@ -44,7 +44,7 @@
                         </columns>
                         <rows>
                             <row>
-                                <label value="${i18n:_('Login name')}" />
+                                <label value="${i18n:_('Username')}" />
                                 <textbox id="loginName"
                                     value="@{controller.user.loginName}" width="300px"
                                     constraint="no empty:${i18n:_('cannot be null or empty')}"
diff --git a/libreplan-webapp/src/main/webapp/users/_listUsers.zul b/libreplan-webapp/src/main/webapp/users/_listUsers.zul
index 6f0b9faf8..c373fb2cc 100644
--- a/libreplan-webapp/src/main/webapp/users/_listUsers.zul
+++ b/libreplan-webapp/src/main/webapp/users/_listUsers.zul
@@ -24,7 +24,7 @@
         pageSize="10" sclass="clickable-rows"
         rowRenderer="@{controller.usersRenderer}">
         <columns sizable="true">
-            <newdatasortablecolumn label="${i18n:_('User login name')}" sort="auto(loginName)" />
+            <newdatasortablecolumn label="${i18n:_('Username')}" sort="auto(loginName)" />
             <newdatasortablecolumn label="${i18n:_('Disabled')}" />
             <newdatasortablecolumn label="${i18n:_('Administrator')}" />
             <newdatasortablecolumn label="${i18n:_('Authentication type')}" />
diff --git a/scripts/functional-tests/account/password_test.sah b/scripts/functional-tests/account/password_test.sah
index 828d5a477..16a066430 100644
--- a/scripts/functional-tests/account/password_test.sah
+++ b/scripts/functional-tests/account/password_test.sah
@@ -75,7 +75,7 @@ function commonUserCreate($name, $password) {
 }
 
 function commonUserForm($name, $password) {
-    _setValue(_textbox(0, _near(_span("Login name"))), $name);
+    _setValue(_textbox(0, _near(_span("Username"))), $name);
     _setValue(_password(0, _near(_span("Password"))), $password);
     _setValue(_password(0, _near(_span("Password confirmation"))), $password);
     _click(_cell("Save"));
diff --git a/scripts/functional-tests/users/profile_test.sah b/scripts/functional-tests/users/profile_test.sah
index 9095ce864..c553c9586 100644
--- a/scripts/functional-tests/users/profile_test.sah
+++ b/scripts/functional-tests/users/profile_test.sah
@@ -71,7 +71,7 @@ function profileAssign($account, $password, $profile){
 }
 
 function accountsForm($name, $password, $profile) {
-    _setValue(_textbox(0, _near(_span("Login name"))), $name);
+    _setValue(_textbox(0, _near(_span("Username"))), $name);
     _setValue(_password(0, _near(_span("Password"))), $password);
     _setValue(_password(0, _near(_span("Password confirmation"))), $password);
     _click(_textbox(0, _near(_cell("Add role"))));
diff --git a/scripts/functional-tests/users/user_test.sah b/scripts/functional-tests/users/user_test.sah
index 09a5548ac..39baabf73 100644
--- a/scripts/functional-tests/users/user_test.sah
+++ b/scripts/functional-tests/users/user_test.sah
@@ -76,7 +76,7 @@ function accountsCreateTwoUserSamePass($name, $password) {
 
 function accountsCreateTwoPass($name, $password, $newPassword){
     commonCreate("Accounts");
-    _setValue(_textbox(0, _near(_span("Login name"))), $name);
+    _setValue(_textbox(0, _near(_span("Username"))), $name);
     _setValue(_password(0, _near(_span("Password"))), $password);
     _setValue(_password(0, _near(_span("Password confirmation"))), $newPassword);
     _click(_cell("Save"));
@@ -86,7 +86,7 @@ function accountsCreateTwoPass($name, $password, $newPassword){
 }
 
 function accountsForm($name, $password) {
-    _setValue(_textbox(0, _near(_span("Login name"))), $name);
+    _setValue(_textbox(0, _near(_span("Username"))), $name);
     _setValue(_password(0, _near(_span("Password"))), $password);
     _setValue(_password(0, _near(_span("Password confirmation"))), $password);
     _click(_cell("Save"));
@@ -94,8 +94,8 @@ function accountsForm($name, $password) {
 
 /* test to check a that LibrePlan give us a error */
 function accountsNotValid(){
-    _assertExists(_span("checkConstraintUniqueLoginName: login name is already being used by another user"));
-    _assert(_isVisible(_span("checkConstraintUniqueLoginName: login name is already being used by another user")));
+    _assertExists(_span("checkConstraintUniqueLoginName: username is already being used by another user"));
+    _assert(_isVisible(_span("checkConstraintUniqueLoginName: username is already being used by another user")));
 }
 
 function accountsComprobateUser($name, $Password) {
@@ -106,7 +106,7 @@ function accountsComprobateUser($name, $Password) {
 function accountsEdit($oldName, $newName, $newPassword, $cell) {
     _click(_link("Accounts"));
     commonEdit($oldName, $cell);
-    _setValue(_textbox(0, _near(_span("Login name"))), $newName);
+    _setValue(_textbox(0, _near(_span("Username"))), $newName);
     _setValue(_password(0, _near(_span("Password"))), $newPassword);
     _setValue(_password(0, _near(_span("Password confirmation"))), $newPassword);
     _click(_textbox(0, _near(_cell("Add role"))));
diff --git a/scripts/rest-clients/export-resources-hours.sh b/scripts/rest-clients/export-resources-hours.sh
index cf34fd7cc..4485293d9 100755
--- a/scripts/rest-clients/export-resources-hours.sh
+++ b/scripts/rest-clients/export-resources-hours.sh
@@ -2,7 +2,7 @@
 
 . ./rest-common-env.sh
 
-printf "Login name: "
+printf "Username: "
 read loginName
 printf "Password: "
 read password
diff --git a/scripts/rest-clients/export.sh b/scripts/rest-clients/export.sh
index 90348af81..5c33f34b8 100755
--- a/scripts/rest-clients/export.sh
+++ b/scripts/rest-clients/export.sh
@@ -2,7 +2,7 @@
 
 . ./rest-common-env.sh
 
-printf "Login name: "
+printf "Username: "
 read loginName
 printf "Password: "
 read password
diff --git a/scripts/rest-clients/get-xml-schema.sh b/scripts/rest-clients/get-xml-schema.sh
index 1a2a7f5fc..3dd8c43d7 100755
--- a/scripts/rest-clients/get-xml-schema.sh
+++ b/scripts/rest-clients/get-xml-schema.sh
@@ -2,7 +2,7 @@
 
 . ./rest-common-env.sh
 
-printf "Login name: "
+printf "Username: "
 read loginName
 printf "Password: "
 read password
diff --git a/scripts/rest-clients/import.sh b/scripts/rest-clients/import.sh
index 355d627d0..856b2b44a 100755
--- a/scripts/rest-clients/import.sh
+++ b/scripts/rest-clients/import.sh
@@ -2,7 +2,7 @@
 
 . ./rest-common-env.sh
 
-printf "Login name: "
+printf "Username: "
 read loginName
 printf "Password: "
 read password