diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java
index d195646d5..de517ea75 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java
@@ -357,9 +357,9 @@ public class CustomMenuController extends Div implements IMenuItemsRegister {
             subItem(_("Task Scheduling Status In Project"),"/reports/workingArrangementsPerOrderReport.zul","15-informes.html"),
             subItem(_("Materials Needs At Date"),"/reports/timeLineMaterialReport.zul","15-informes.html"));
 
-        topItem(_("My account"), "/settings/settings.zul", "",
-                subItem(_("Settings"), "/settings/settings.zul", ""),
-                subItem(_("Change Password"), "/settings/changePassword.zul", ""));
+        topItem(_("My account"), "/myaccount/settings.zul", "",
+                subItem(_("Settings"), "/myaccount/settings.zul", ""),
+                subItem(_("Change Password"), "/myaccount/changePassword.zul", ""));
     }
 
     private Vbox getRegisteredItemsInsertionPoint() {
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordModel.java
index 7252f1a22..fb44db3fd 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordModel.java
@@ -45,7 +45,7 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Service
 @Scope(BeanDefinition.SCOPE_PROTOTYPE)
-@OnConcurrentModification(goToPage = "/settings/changePassword.zul")
+@OnConcurrentModification(goToPage = "/myaccount/changePassword.zul")
 public class PasswordModel implements IPasswordModel {
 
     @Autowired
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java
index c75632277..4a7df6763 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java
@@ -43,7 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Service
 @Scope(BeanDefinition.SCOPE_PROTOTYPE)
-@OnConcurrentModification(goToPage = "/settings/settings.zul")
+@OnConcurrentModification(goToPage = "/myaccount/settings.zul")
 public class SettingsModel implements ISettingsModel {
 
     @Autowired
diff --git a/libreplan-webapp/src/main/webapp/settings/changePassword.zul b/libreplan-webapp/src/main/webapp/myaccount/changePassword.zul
similarity index 100%
rename from libreplan-webapp/src/main/webapp/settings/changePassword.zul
rename to libreplan-webapp/src/main/webapp/myaccount/changePassword.zul
diff --git a/libreplan-webapp/src/main/webapp/settings/settings.zul b/libreplan-webapp/src/main/webapp/myaccount/settings.zul
similarity index 100%
rename from libreplan-webapp/src/main/webapp/settings/settings.zul
rename to libreplan-webapp/src/main/webapp/myaccount/settings.zul