diff --git a/core/lib/Thelia/Config/Resources/routing/front.xml b/core/lib/Thelia/Config/Resources/routing/front.xml
index 3e0c39939..688e4da63 100755
--- a/core/lib/Thelia/Config/Resources/routing/front.xml
+++ b/core/lib/Thelia/Config/Resources/routing/front.xml
@@ -43,6 +43,16 @@
         <default key="_view">login</default>
     </route>
 
+    <route id="customer.password.retrieve.process" path="/password" methods="post">
+        <default key="_controller">Thelia\Controller\Front\CustomerController::newPasswordAction</default>
+        <default key="_view">password</default>
+    </route>
+
+    <route id="customer.password.retrieve.view" path="/password" methods="get">
+        <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
+        <default key="_view">password</default>
+    </route>
+
     <!-- Customer routes : Logout -->
     <route id="customer.logout.process" path="/logout">
         <default key="_controller">Thelia\Controller\Front\CustomerController::logoutAction</default>
@@ -65,12 +75,12 @@
     </route>
 
 
-    <route id="customer.password.retrieve.process" path="/account/password" methods="post">
+    <route id="customer.password.change.process" path="/account/password" methods="post">
         <default key="_controller">Thelia\Controller\Front\CustomerController::newPasswordAction</default>
         <default key="_view">account-password</default>
     </route>
 
-    <route id="customer.password.retrieve.view" path="account/password" methods="get">
+    <route id="customer.password.change.view" path="/account/password" methods="get">
         <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
         <default key="_view">account-password</default>
     </route>
diff --git a/templates/default/password.html b/templates/default/password.html
index 96ef9ffce..f3fbcf046 100644
--- a/templates/default/password.html
+++ b/templates/default/password.html
@@ -33,7 +33,7 @@
                 </div>
                 {/form_field}
                 <div class="group-btn">
-                    <a href="{url path="/"}" class="btn btn-cancel">{intl l="Cancel"}</a>
+                    <a href="{url path="/login"}" class="btn btn-cancel">{intl l="Cancel"}</a>
                     <button type="submit" class="btn btn-forgot">{intl l="Send"}</button>
                 </div>
             </form>