diff --git a/app/Http/routes.php b/app/Http/routes.php
index 1b513bb540..747682d5c2 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -3,7 +3,23 @@
 // auth routes, i think
 Route::group(
     ['middleware' => 'web'], function () {
-    Route::auth();
+
+    // Authentication Routes...
+    Route::get('/login', 'Auth\AuthController@showLoginForm');
+    Route::post('/login', 'Auth\AuthController@login');
+    Route::get('/logout', 'Auth\AuthController@logout');
+
+    // Registration Routes...
+    Route::get('/register', ['uses' => 'Auth\AuthController@showRegistrationForm', 'as' => 'register']);
+    Route::post('/register', 'Auth\AuthController@register');
+
+    Route::get('/password/reset', 'Auth\PasswordController@getReset');
+
+    // Password Reset Routes...
+    Route::get('/password/reset/{token?}', 'Auth\PasswordController@showResetForm');
+    Route::post('/password/email', 'Auth\PasswordController@sendResetLinkEmail');
+    Route::post('/password/reset', 'Auth\PasswordController@reset');
+
 
     //Route::get('/home', 'HomeController@index');
 }
diff --git a/resources/views/auth/password.twig b/resources/views/auth/password.twig
index bce754d502..20323c501f 100644
--- a/resources/views/auth/password.twig
+++ b/resources/views/auth/password.twig
@@ -20,25 +20,34 @@
         </div>
     {% endif %}
 
+
+
     <div class="login-box-body">
-        <p class="login-box-msg">Reset your password</p>
+        {% if session('status') %}
+            <p class="login-box-msg text-success">
+                {{ session('status') }}
+            </p>
+        {% else %}
+            <p class="login-box-msg">Reset your password</p>
 
-        <form role="form" method="POST" action="{{ URL.to('/password/reset') }}">
-            <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
+            <form role="form" method="POST" action="{{ URL.to('/password/email') }}">
+                <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
 
-            <div class="form-group has-feedback">
-                <input type="email" class="form-control" name="email" placeholder="Email"/>
-            </div>
-
-            <div class="row">
-                <!-- /.col -->
-                <div class="col-xs-12">
-                    <button type="submit" class="btn btn-primary btn-flat pull-right">Reset</button>
+                <div class="form-group has-feedback">
+                    <input type="email" class="form-control" name="email" placeholder="Email"/>
                 </div>
-                <!-- /.col -->
-            </div>
 
-        </form>
+                <div class="row">
+                    <!-- /.col -->
+                    <div class="col-xs-12">
+                        <button type="submit" class="btn btn-primary btn-flat pull-right">Reset</button>
+                    </div>
+                    <!-- /.col -->
+                </div>
+
+            </form>
+
+        {% endif %}
 
         <a href="{{ URL.to('/login') }}">I want to login</a><br>
         <a href="{{ URL.to('/password/reset') }}">I forgot my password</a>
diff --git a/resources/views/auth/reset.twig b/resources/views/auth/reset.twig
index 62e1f7eb4e..c70b06e8a8 100644
--- a/resources/views/auth/reset.twig
+++ b/resources/views/auth/reset.twig
@@ -13,12 +13,9 @@
         </div>
     {% endif %}
 
-
-
     <div class="register-box-body">
         <p class="login-box-msg">Reset your password</p>
-
-        <form method="POST" action="/password/reset">
+        <form method="POST" action="{{ url('/password/reset') }}">
             <input type="hidden" name="_token" value="{{ csrf_token() }}">
             <input type="hidden" name="token" value="{{ token }}">