diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java
index 5db1b241f..3c442a0e6 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java
@@ -65,6 +65,7 @@ import org.zkoss.zul.api.Groupbox;
  *
  * @author Jacobo Aragunde Perez <jaragunde@igalia.com>
  * @author Manuel Rego Casasnovas <rego@igalia.com>
+ * @author Javier Moran Rua <jmoran@igalia.com>
  */
 @SuppressWarnings("serial")
 public class UserCRUDController extends BaseCRUDController<User> implements
@@ -184,6 +185,7 @@ public class UserCRUDController extends BaseCRUDController<User> implements
         return userModel.getUsers();
     }
 
+    @Override
     protected void save() throws ValidationException {
         userModel.confirmSave();
         PasswordUtil.showOrHideDefaultPasswordWarnings();
@@ -352,7 +354,7 @@ public class UserCRUDController extends BaseCRUDController<User> implements
                         removeRole(role);
                     }
                 });
-                removeButton.setDisabled(getLdapUserRolesLdapConfiguration()
+                removeButton.setDisabled(areRolesAndProfilesDisabled()
                         || role.equals(UserRole.ROLE_BOUND_USER)
                         || isUserDefaultAdmin());
                 row.appendChild(removeButton);
@@ -452,7 +454,8 @@ public class UserCRUDController extends BaseCRUDController<User> implements
     }
 
     public boolean areRolesAndProfilesDisabled() {
-        return isLdapUserLdapConfiguration() || isUserDefaultAdmin();
+        return (isLdapUser() && userModel.isLDAPBeingUsed() && userModel
+                .isLDAPRolesBeingUsed()) || isUserDefaultAdmin();
     }
 
     public boolean isLdapUserOrDefaultAdmin() {
diff --git a/libreplan-webapp/src/main/webapp/users/_editUser.zul b/libreplan-webapp/src/main/webapp/users/_editUser.zul
index 2f12f278d..849a61148 100644
--- a/libreplan-webapp/src/main/webapp/users/_editUser.zul
+++ b/libreplan-webapp/src/main/webapp/users/_editUser.zul
@@ -32,11 +32,11 @@
                 <vbox>
 
                     <!-- User details  -->
-                    <vbox>
-                        <label value="${i18n:_('Password cannot be managed for LDAP users because LDAP authentication is being used')}" visible="@{controller.ldapUserLdapConfiguration}" />
-                    </vbox>
                     <groupbox closable="false">
                     <caption label="${i18n:_('General user data')}" />
+                    <vbox>
+                        <label value="${i18n:_('Password cannot be managed for LDAP users because LDAP authentication is enabled.')}" visible="@{controller.ldapUserLdapConfiguration}" />
+                    </vbox>
                     <grid fixedLayout="false" span="true">
                         <columns>
                             <column width="200px" />
@@ -125,7 +125,7 @@
                     <groupbox closable="false">
                     <caption label="${i18n:_('Association with roles')}" />
                     <vbox>
-                        <label value="${i18n:_('Roles of LDAP users cannot be managed because LDAP roles are being used.')}" visible="@{controller.ldapUserRolesLdapConfiguration}" />
+                        <label value="${i18n:_('Roles of LDAP users cannot be managed because LDAP is enabled and LDAP roles are being used.')}" visible="@{controller.areRolesAndProfilesDisabled}" />
                     </vbox>
                     <hbox align="center">
                         <combobox id="userRolesCombo" autodrop="true" />
@@ -146,7 +146,7 @@
                     <groupbox closable="false">
                     <caption label="${i18n:_('Association with profiles')}" />
                     <vbox>
-                        <label value="${i18n:_('Profiles of LDAP users cannot be managed because LDAP roles are being used.')}" visible="@{controller.ldapUserRolesLdapConfiguration}" />
+                        <label value="${i18n:_('Profiles of LDAP users cannot be managed because LDAP is enabled and LDAP roles are being used.')}" visible="@{controller.areRolesAndProfilesDisabled}" />
                     </vbox>
                     <hbox align="center">
                         <combobox id="profilesCombo" autodrop="true" />