diff --git a/resources/assets/js/views/auth/forgot.js b/resources/assets/js/views/auth/forgot.js
index e399770b0..c156d1d92 100644
--- a/resources/assets/js/views/auth/forgot.js
+++ b/resources/assets/js/views/auth/forgot.js
@@ -11,16 +11,17 @@ import Vue from 'vue';
 import Global from './../../mixins/global';
 
 import Form from './../../plugins/form';
-import BulkAction from './../../plugins/bulk-action';
 
 const app = new Vue({
     el: '#app',
+
     mixins: [
         Global
     ],
+
     data: function () {
         return {
-            form: new Form('item')
+            form: new Form('forgot')
         }
-    }
+    },
 });
diff --git a/resources/assets/js/views/auth/login.js b/resources/assets/js/views/auth/login.js
index 0436a8807..fd965e5bf 100644
--- a/resources/assets/js/views/auth/login.js
+++ b/resources/assets/js/views/auth/login.js
@@ -15,30 +15,14 @@ import BulkAction from './../../plugins/bulk-action';
 
 const app = new Vue({
     el: '#app',
+
     mixins: [
         Global
     ],
+
     data: function () {
         return {
             form: new Form('login')
         }
-    },
-    watch:{
-        'form.response'(notify) {
-            /*
-            if (!notify.message) {
-                return {};
-            }
-
-            var type = (notify.success) ? 'success' : 'warning';
-
-            this.$notify({
-                message: notify.message,
-                timeout: 5000,
-                icon: 'ni ni-bell-55',
-                type
-            });
-            */
-        }
     }
 });
diff --git a/resources/views/auth/forgot/create.blade.php b/resources/views/auth/forgot/create.blade.php
index 955c27378..48f63ddd5 100644
--- a/resources/views/auth/forgot/create.blade.php
+++ b/resources/views/auth/forgot/create.blade.php
@@ -1,28 +1,28 @@
 @extends('layouts.auth')
 
-@section('title', trans('auth.reset_password'))
 @section('message', trans('auth.reset_password'))
 
 @section('content')
-    <form role="form" method="POST" action="{{ url('auth/forgot') }}">
-        {{ csrf_field() }}
+    {!! Form::open([
+        'route' => 'forgot',
+        'id' => 'forgot',
+        '@submit.prevent' => 'onSubmit',
+        '@keydown' => 'form.errors.clear($event.target.name)',
+        'files' => true,
+        'role' => 'form',
+        'class' => 'form-loading-button',
+        'novalidate' => true
+    ]) !!}
+
 
         @stack('email_input_start')
-            <div class="form-group has-feedback{{ $errors->has('email') ? ' has-error' : '' }}">
-                <div class="input-group input-group-merge input-group-alternative">
-                    <div class="input-group-prepend">
-                        <span class="input-group-text"><i class="fa fa-envelope"></i></span>
-                    </div>
-                    <input class="form-control" placeholder="{{ trans('general.email') }}" name="email" type="email">
-                </div>
-                @if ($errors->has('email'))
-                    <span class="help-block">
-                        <strong>{{ $errors->first('email') }}</strong>
-                    </span>
-                @endif
-            </div>
+            {{ Form::emailGroup('email', false, 'envelope', ['placeholder' => trans('general.email')], null, 'has-feedback', 'input-group-alternative') }}
         @stack('email_input_end')
 
         <button type="submit" class="btn btn-success float-right">{{ trans('general.send') }}</button>
-    </form>
+    {!! Form::close() !!}
 @endsection
+
+@push('scripts_start')
+    <script src="{{ asset('public/js/auth/forgot.js?v=' . version('short')) }}"></script>
+@endpush