diff --git a/app/Http/routes.php b/app/Http/routes.php
index a0260e4b6b4e..8066690990cb 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -79,8 +79,8 @@ Route::post('/signup', array('as' => 'signup', 'uses' => 'Auth\AuthController@po
 Route::get('/login', array('as' => 'login', 'uses' => 'Auth\AuthController@getLoginWrapper'));
 Route::post('/login', array('as' => 'login', 'uses' => 'Auth\AuthController@postLoginWrapper'));
 Route::get('/logout', array('as' => 'logout', 'uses' => 'Auth\AuthController@getLogoutWrapper'));
-Route::get('/forgot', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@getEmail'));
-Route::post('/forgot', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@postEmail'));
+Route::get('/recover_password', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@getEmail'));
+Route::post('/recover_password', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@postEmail'));
 Route::get('/password/reset/{token}', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@getReset'));
 Route::post('/password/reset', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@postReset'));
 Route::get('/user/confirm/{code}', 'UserController@confirm');
@@ -89,8 +89,8 @@ Route::get('/user/confirm/{code}', 'UserController@confirm');
 Route::get('/client/login', array('as' => 'login', 'uses' => 'ClientAuth\AuthController@getLogin'));
 Route::post('/client/login', array('as' => 'login', 'uses' => 'ClientAuth\AuthController@postLogin'));
 Route::get('/client/logout', array('as' => 'logout', 'uses' => 'ClientAuth\AuthController@getLogout'));
-Route::get('/client/forgot', array('as' => 'forgot', 'uses' => 'ClientAuth\PasswordController@getEmail'));
-Route::post('/client/forgot', array('as' => 'forgot', 'uses' => 'ClientAuth\PasswordController@postEmail'));
+Route::get('/client/recover_password', array('as' => 'forgot', 'uses' => 'ClientAuth\PasswordController@getEmail'));
+Route::post('/client/recover_password', array('as' => 'forgot', 'uses' => 'ClientAuth\PasswordController@postEmail'));
 Route::get('/client/password/reset/{invitation_key}/{token}', array('as' => 'forgot', 'uses' => 'ClientAuth\PasswordController@getReset'));
 Route::post('/client/password/reset', array('as' => 'forgot', 'uses' => 'ClientAuth\PasswordController@postReset'));
 
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index fe275fe1d54f..b51734c80a9a 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -105,7 +105,7 @@
             @endif
 
             <p class="link">
-                {!! link_to('/forgot', trans('texts.forgot_password')) !!}
+                {!! link_to('/recover_password', trans('texts.recover_password')) !!}
                 {!! link_to(NINJA_WEB_URL.'/knowledgebase/', trans('texts.knowledge_base'), ['target' => '_blank', 'class' => 'pull-right']) !!}
             </p>
 
diff --git a/resources/views/auth/password.blade.php b/resources/views/auth/password.blade.php
index 0cb2596e78a4..50436beab357 100644
--- a/resources/views/auth/password.blade.php
+++ b/resources/views/auth/password.blade.php
@@ -53,7 +53,7 @@
 @section('body')
 <div class="container">
 
-{!! Former::open('forgot')->rules(['email' => 'required|email'])->addClass('form-signin') !!}
+{!! Former::open('recover_password')->rules(['email' => 'required|email'])->addClass('form-signin') !!}
   <div class="modal-header">
     <img src="{{ asset('images/icon-login.png') }}" />
     <h4>Invoice Ninja | {{ trans('texts.password_recovery') }}</h4></div>
diff --git a/resources/views/clientauth/login.blade.php b/resources/views/clientauth/login.blade.php
index 0469e882b092..6ad28a593831 100644
--- a/resources/views/clientauth/login.blade.php
+++ b/resources/views/clientauth/login.blade.php
@@ -89,7 +89,7 @@
                     ->large()->submit()->block() !!}</p>
 
             <p class="link">
-                {!! link_to('/client/forgot', trans('texts.forgot_password')) !!}
+                {!! link_to('/client/recover_password', trans('texts.recover_password')) !!}
             </p>
 
 
diff --git a/resources/views/clientauth/password.blade.php b/resources/views/clientauth/password.blade.php
index 7216765b4d04..79fc36a9a775 100644
--- a/resources/views/clientauth/password.blade.php
+++ b/resources/views/clientauth/password.blade.php
@@ -52,7 +52,7 @@
 @section('body')
 <div class="container">
 
-{!! Former::open('client/forgot')->addClass('form-signin') !!}
+{!! Former::open('client/recover_password')->addClass('form-signin') !!}
     <div class="modal-header">
         @if (!isset($hideLogo) || !$hideLogo)
             <a href="{{ NINJA_WEB_URL }}" target="_blank">