diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php
index 3106193591ce..3741a8157983 100644
--- a/app/Http/Controllers/Auth/PasswordController.php
+++ b/app/Http/Controllers/Auth/PasswordController.php
@@ -20,6 +20,8 @@ class PasswordController extends Controller {
 
 	use ResetsPasswords;
 
+    protected $redirectTo = '/dashboard';
+    
 	/**
 	 * Create a new password controller instance.
 	 *
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 0675fbe21180..52d83cf57e59 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -66,8 +66,10 @@ post('/signup', array('as' => 'signup', 'uses' => 'Auth\AuthController@postRegis
 get('/login', array('as' => 'login', 'uses' => 'Auth\AuthController@getLogin'));
 post('/login', array('as' => 'login', 'uses' => 'Auth\AuthController@postLogin'));
 get('/logout', array('as' => 'logout', 'uses' => 'Auth\AuthController@getLogout'));
-get('/forgot', array('as' => 'forgot', 'uses' => 'Auth\AuthController@getLogin'));
-post('/forgot', array('as' => 'forgot', 'uses' => 'Auth\AuthController@postLogin'));
+get('/forgot', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@getEmail'));
+post('/forgot', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@postEmail'));
+get('/password/reset', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@getReset'));
+post('/password/reset', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@postReset'));
 
 /*
 // Confide routes
diff --git a/database/migrations/2015_03_30_100000_create_password_resets_table.php b/database/migrations/2015_03_30_100000_create_password_resets_table.php
new file mode 100644
index 000000000000..679df38f8838
--- /dev/null
+++ b/database/migrations/2015_03_30_100000_create_password_resets_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreatePasswordResetsTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('password_resets', function(Blueprint $table)
+		{
+			$table->string('email')->index();
+			$table->string('token')->index();
+			$table->timestamp('created_at');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('password_resets');
+	}
+
+}
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index cd5993158e7d..3e68c0ea9499 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -65,10 +65,10 @@
                 {!! Former::password('password')->placeholder(trans('texts.password'))->raw() !!}
             </p>
 
-            <p>{!! Button::primary(trans('texts.lets_go'))->withAttributes(array('class' => 'btn-lg'))->submit()->block() !!}</p>
+            <p>{!! Button::success(trans('texts.lets_go'))->withAttributes(array('class' => 'btn-lg'))->submit()->block() !!}</p>
 
             <p class="link">
-                {!! link_to('forgot_password', trans('texts.forgot_password')) !!}
+                {!! link_to('/forgot', trans('texts.forgot_password')) !!}
             </p>
 
 
diff --git a/resources/views/users/forgot_password.blade.php b/resources/views/auth/password.blade.php
similarity index 77%
rename from resources/views/users/forgot_password.blade.php
rename to resources/views/auth/password.blade.php
index 4393ecec83f3..c2f563b030b1 100644
--- a/resources/views/users/forgot_password.blade.php
+++ b/resources/views/auth/password.blade.php
@@ -53,7 +53,7 @@
 @section('body')
 <div class="container">
 
-{!! Former::open('forgot_password')->rules(['email' => 'required|email'])->addClass('form-signin') !!}
+{!! Former::open('forgot')->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>
@@ -63,7 +63,21 @@
         {!! Former::text('email')->placeholder(trans('texts.email_address'))->raw() !!}
     </p>
 
-    <p>{!! Button::normal(trans('texts.send_email'))->withAttributes(array('class' => 'btn-lg'))->submit()->block() !!}</p>
+    <p>{!! Button::success(trans('texts.send_email'))->withAttributes(array('class' => 'btn-lg'))->submit()->block() !!}</p>
+
+    @if (count($errors->all()))
+        <div class="alert alert-danger">
+            @foreach ($errors->all() as $error)
+                <li>{{ $error }}</li>
+            @endforeach
+        </div>
+    @endif
+
+    @if (session('status'))
+        <div class="alert alert-info">
+            {{ session('status') }}
+        </div>
+    @endif
 
     <!-- if there are login errors, show them here -->
     @if (Session::has('warning'))
diff --git a/resources/views/users/reset_password.blade.php b/resources/views/auth/reset.blade.php
similarity index 69%
rename from resources/views/users/reset_password.blade.php
rename to resources/views/auth/reset.blade.php
index 1c4e7750b503..7bdf2a66a550 100644
--- a/resources/views/users/reset_password.blade.php
+++ b/resources/views/auth/reset.blade.php
@@ -53,10 +53,10 @@
 @section('body')
 <div class="container">
 
-  {{ Former::open('user/reset')->addClass('form-signin')->rules(array(
-  'password' => 'required',
-  'password_confirmation' => 'required',        
-  )); }}
+  {!! Former::open('/password/reset')->addClass('form-signin')->rules(array(
+        'password' => 'required',
+        'password_confirmation' => 'required',        
+  )) !!}
 
   <div class="modal-header">
     <img src="{{ asset('images/icon-login.png') }}" />
@@ -66,12 +66,22 @@
       <input type="hidden" name="token" value="{{{ $token }}}">
 
       <p>
-        {{ Former::password('password')->placeholder(trans('texts.password'))->raw() }}				
-        {{ Former::password('password_confirmation')->placeholder(trans('texts.confirm_password'))->raw() }}				
+        {!! Former::text('email')->placeholder(trans('texts.email'))->raw() !!}               
+        {!! Former::password('password')->placeholder(trans('texts.password'))->raw() !!}               
+        {!! Former::password('password_confirmation')->placeholder(trans('texts.confirm_password'))->raw() !!}
 
     </p>
 
-    <p>{{ Button::success_submit(trans('texts.save'), array('class' => 'btn-lg'))->block() }}</p>
+    <p>{!! Button::success(trans('texts.save'), array('class' => 'btn-lg'))->submit()->block() !!}</p>
+
+
+    @if (count($errors->all()))
+        <div class="alert alert-danger">
+            @foreach ($errors->all() as $error)
+                <li>{{ $error }}</li>
+            @endforeach
+        </div>
+    @endif
 
     <!-- if there are login errors, show them here -->
     @if (Session::has('warning'))
@@ -87,7 +97,7 @@
     @endif
 
 
-    {{ Former::close() }}
+    {!! Former::close() !!}
 </div>
 
 </div>
diff --git a/resources/views/emails/passwordreset_html.blade.php b/resources/views/emails/password.blade.php
similarity index 67%
rename from resources/views/emails/passwordreset_html.blade.php
rename to resources/views/emails/password.blade.php
index 52ad2763ed5f..b42fc337f5e8 100644
--- a/resources/views/emails/passwordreset_html.blade.php
+++ b/resources/views/emails/password.blade.php
@@ -1,7 +1,7 @@
 {{ trans('texts.email_salutation', ['name' => $user->username]) }} <p/>
 
 {{ trans('texts.reset_password') }} <br/> 
-{{{ (Confide::checkAction('UserController@reset_password', array($token))) ? : URL::to('user/reset/'.$token)  }}}<p/>
+{!! url('password/reset/'.$token) !!}<p/>
 
 {{ trans('texts.email_signature') }} <br/>
 {{ trans('texts.email_from') }} <p/>
diff --git a/resources/views/users/login.blade.php b/resources/views/users/login.blade.php
deleted file mode 100644
index d0dc37fd0cde..000000000000
--- a/resources/views/users/login.blade.php
+++ /dev/null
@@ -1,119 +0,0 @@
-@extends('master')
-
-@section('head')	
-
-<link href="{{ asset('css/bootstrap.min.css') }}" rel="stylesheet" type="text/css"/> 
-<link href="{{ asset('css/style.css') }}" rel="stylesheet" type="text/css"/>    
-
-<style type="text/css">
-    body {
-        padding-top: 40px;
-        padding-bottom: 40px;
-    }
-    .modal-header {
-        border-top-left-radius: 3px;
-        border-top-right-radius: 3px;
-    }
-    .modal-header h4 {
-        margin:0;
-    }
-    .modal-header img {
-        float: left; 
-        margin-right: 20px;
-    }
-    .form-signin {
-        max-width: 400px;
-        margin: 0 auto;
-        background: #fff;
-    }
-    p.link a {
-        font-size: 11px;
-    }
-    .form-signin .inner {
-        padding: 20px;
-        border-bottom-right-radius: 3px;
-        border-bottom-left-radius: 3px;
-        border-left: 1px solid #ddd;
-        border-right: 1px solid #ddd;
-        border-bottom: 1px solid #ddd;
-    }
-    .form-signin .checkbox {
-        font-weight: normal;
-    }
-    .form-signin .form-control {
-        margin-bottom: 17px !important;
-    }
-    .form-signin .form-control:focus {
-        z-index: 2;
-    }
-
-</style>
-
-@endsection
-
-@section('body')
-<div class="container">
-
-
-    {!! Former::open('login')->rules(['login_email' => 'required|email', 'login_password' => 'required'])->addClass('form-signin') !!}
-    <div class="modal-header">
-        <img src="{{ asset('images/icon-login.png') }}" />
-        <h4>Invoice Ninja | {{ trans('texts.account_login') }}</h4></div>
-        <div class="inner">
-            <p>
-                {{ $errors->first('login_email') }}
-                {{ $errors->first('login_password') }}
-            </p>
-
-            <p>
-                {!! Former::text('login_email')->placeholder(trans('texts.email_address'))->raw() !!}
-                {!! Former::password('login_password')->placeholder(trans('texts.password'))->raw() !!}
-            </p>
-
-            <p>{!! Button::primary(trans('texts.lets_go'))->withAttributes(array('class' => 'btn-lg'))->submit()->block() !!}</p>
-            
-            <p class="link">
-                {!! link_to('forgot_password', trans('texts.forgot_password')) !!}
-            </p>
-
-
-            @if (Session::has('warning'))
-            <div class="alert alert-warning">{{ Session::get('warning') }}</div>
-            @endif
-
-            @if (Session::has('message'))
-            <div class="alert alert-info">{{ Session::get('message') }}</div>
-            @endif
-
-            @if (Session::has('error'))
-            <div class="alert alert-danger">{{ Session::get('error') }}</div>
-            @endif
-
-        </div>
-
-        {!! Former::close() !!}
-
-        @if (!Utils::isNinja())
-        <p/>
-        <center>
-            <div id="fb-root"></div>
-            <script>(function(d, s, id) {
-                var js, fjs = d.getElementsByTagName(s)[0];
-                if (d.getElementById(id)) return;
-                js = d.createElement(s); js.id = id;
-                js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=635126583203143";
-                fjs.parentNode.insertBefore(js, fjs);
-            }(document, 'script', 'facebook-jssdk'));</script>
-
-            <div class="fb-follow" data-href="https://www.facebook.com/invoiceninja" data-colorscheme="light" data-layout="button" data-show-faces="false"></div>&nbsp;&nbsp;
-
-            <a href="https://twitter.com/invoiceninja" class="twitter-follow-button" data-show-count="false" data-related="hillelcoren" data-size="medium">Follow @invoiceninja</a>
-            <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
-
-            <iframe src="https://ghbtns.com/github-btn.html?user=hillelcoren&repo=invoice-ninja&type=star&count=false" frameborder="0" scrolling="0" width="50px" height="20px"></iframe>
-        </center>
-        @endif
-
-    </div>
-
-    @endsection
\ No newline at end of file