diff --git a/resources/themes/adminlte/views/auth/login.blade.php b/resources/themes/adminlte/views/auth/login.blade.php
index 9452753..747ef65 100644
--- a/resources/themes/adminlte/views/auth/login.blade.php
+++ b/resources/themes/adminlte/views/auth/login.blade.php
@@ -79,12 +79,12 @@
 				@endif
 
 				<p class="mb-1">
-					<a name="reset" href="{{ url('/password/reset') }}">{{ trans('adminlte_lang::message.forgotpassword') }}</a>
+					<a name="reset" href="{{ url('password/reset') }}">{{ trans('adminlte_lang::message.forgotpassword') }}</a>
 				</p>
 
 				@isset($register)
 					<p class="mb-0">
-						<a href="register.html" class="text-center">Register a new membership</a>
+						<a href="{{ url('register') }}" class="text-center">{{ trans('adminlte_lang::message.register') }}</a>
 					</p>
 				@endisset
 			</div>
diff --git a/resources/themes/adminlte/views/auth/passwords/email.blade.php b/resources/themes/adminlte/views/auth/passwords/email.blade.php
index 27a8f32..676b828 100644
--- a/resources/themes/adminlte/views/auth/passwords/email.blade.php
+++ b/resources/themes/adminlte/views/auth/passwords/email.blade.php
@@ -5,41 +5,63 @@
 @endsection
 
 @section('content')
-<body class="hold-transition login-page">
-	<div id="app" v-cloak>
-		<div class="login-box">
-			<div class="login-logo">
-				<a href="{{ url('/home') }}">{!! config('app.name_html_long') !!}</a>
-			</div><!-- /.login-logo -->
+	<div class="login-box m-auto">
+		<div class="login-logo">
+			<a>{!! config('app.name_html_long') !!}</a>
+		</div>
 
-			@if (session('status'))
-				<div class="alert alert-success">
-					{{ session('status') }}
+		@if (Session::has('status'))
+			<div class="text-center mb-3">
+				<div class="alert alert-success m-auto">
+					<strong>OK!</strong> {{ Session::get('status') }}
 				</div>
-			@endif
+			</div>
+		@endif
 
-			@if (count($errors) > 0)
-				<div class="alert alert-danger">
-					<strong>Whoops!</strong> {{ trans('adminlte_lang::message.someproblems') }}<br><br>
-					<ul>
-						@foreach ($errors->all() as $error)
-							<li>{{ $error }}</li>
-						@endforeach
-					</ul>
-				</div>
-			@endif
+		@if (count($errors) > 0)
+			<div class="alert alert-danger">
+				<strong>Whoops!</strong> {{ trans('adminlte_lang::message.someproblems') }}<br><br>
+				<ul>
+					@foreach ($errors->all() as $error)
+						<li>{{ $error }}</li>
+					@endforeach
+				</ul>
+			</div>
+		@endif
 
-			<div class="login-box-body">
-				<p class="login-box-msg">{{ trans('adminlte_lang::message.passwordreset') }}</p>
+		<!-- /.login-logo -->
+		<div class="card">
+			<div class="card-body login-card-body">
+				<p class="login-box-msg">You forgot your password? Here you can easily retrieve a new password.</p>
 
-				<email-reset-password-form></email-reset-password-form>
+				<form method="post" action="{{ url('password/email') }}">
+					{{ csrf_field() }}
+					<div class="input-group mb-3">
+						<input type="email" name="email" class="form-control" placeholder="Email" required>
+						<div class="input-group-append">
+							<span class="fa fa-envelope input-group-text"></span>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-12">
+							<button type="submit" class="btn btn-primary btn-block">{{ trans('adminlte_lang::message.sendpassword') }}</button>
+						</div>
+						<!-- /.col -->
+					</div>
+				</form>
 
-				<a href="{{ url('/login') }}">Log in</a><br>
-			</div><!-- /.login-box-body -->
+				<p class="mt-3 mb-1">
+					<a href="{{ url('login') }}">{{ trans('adminlte_lang::message.login') }}</a>
+				</p>
 
-		</div><!-- /.login-box -->
+				@isset($register)
+					<p class="mb-0">
+						<a href="{{ url('register') }}" class="text-center">{{ trans('adminlte_lang::message.register') }}</a>
+					</p>
+				@endisset
+			</div>
+			<!-- /.login-card-body -->
+		</div>
 	</div>
-
-	@include('adminlte::layouts.partials.scripts_auth')
-</body>
+	<!-- /.login-box -->
 @endsection
\ No newline at end of file
diff --git a/resources/themes/adminlte/views/auth/passwords/reset.blade.php b/resources/themes/adminlte/views/auth/passwords/reset.blade.php
index 2788f15..06d0180 100644
--- a/resources/themes/adminlte/views/auth/passwords/reset.blade.php
+++ b/resources/themes/adminlte/views/auth/passwords/reset.blade.php
@@ -5,42 +5,65 @@
 @endsection
 
 @section('content')
-<body class="hold-transition login-page">
-	<div id="app" v-cloak>
-		<div class="login-box">
-			<div class="login-logo">
-				<a href="{{ url('/home') }}">{!! config('app.name_html_long') !!}</a>
-			</div><!-- /.login-logo -->
+	<div class="login-box m-auto">
+		<div class="login-logo">
+			<a>{!! config('app.name_html_long') !!}</a>
+		</div>
 
-			@if (session('status'))
-				<div class="alert alert-success">
-					{{ session('status') }}
-				</div>
-			@endif
+		@if (count($errors) > 0)
+			<div class="alert alert-danger">
+				<strong>Whoops!</strong> {{ trans('adminlte_lang::message.someproblems') }}<br><br>
+				<ul>
+					@foreach ($errors->all() as $error)
+						<li>{{ $error }}</li>
+					@endforeach
+				</ul>
+			</div>
+		@endif
 
-			@if (count($errors) > 0)
-				<div class="alert alert-danger">
-					<strong>Whoops!</strong> {{ trans('adminlte_lang::message.someproblems') }}<br><br>
-					<ul>
-						@foreach ($errors->all() as $error)
-							<li>{{ $error }}</li>
-						@endforeach
-					</ul>
-				</div>
-			@endif
+		<!-- /.login-logo -->
+		<div class="card">
+			<div class="card-body login-card-body">
+				<p class="login-box-msg">You are only one step a way from your new password, set your new password now.</p>
 
-			<div class="login-box-body">
-				<p class="login-box-msg">{{ trans('adminlte_lang::message.passwordreset') }}</p>
+				<form method="post" action="{{ url('password/reset') }}">
+					{{ csrf_field() }}
+					<div class="input-group mb-3">
+						<input type="email" name="email" class="form-control" placeholder="Email" required>
+						<div class="input-group-append">
+							<span class="fa fa-envelope input-group-text"></span>
+						</div>
+					</div>
+					<div class="input-group mb-3">
+						<input type="password" name="password" class="form-control" placeholder="Password" required>
+						<div class="input-group-append">
+							<span class="fa fa-lock input-group-text"></span>
+						</div>
+					</div>
+					<div class="input-group mb-3">
+						<input type="password" name="password_confirmation" class="form-control" placeholder="Confirm Password" data-match="#password" required>
+						<div class="input-group-append">
+							<span class="fa fa-lock input-group-text"></span>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-12">
+							<button type="submit" class="btn btn-primary btn-block">{{ trans('adminlte_lang::message.passwordreset') }}</button>
+						</div>
+						<!-- /.col -->
+					</div>
+					<input type="hidden" name="token" value="{{ $token }}">
+				</form>
 
-				<reset-password-form token="{{ $token }}">></reset-password-form>
-
-				<a href="{{ url('/login') }}">Log in</a><br>
-				<a href="{{ url('/register') }}" class="text-center">{{ trans('adminlte_lang::message.register') }}</a>
-			</div><!-- /.login-box-body -->
-
-		</div><!-- /.login-box -->
+				<p class="mt-3 mb-1">
+					<a href="{{ url('login') }}">Login</a>
+					@isset($register)
+						<a href="{{ url('register') }}" class="text-center">{{ trans('adminlte_lang::message.register') }}</a>
+					@endisset
+				</p>
+			</div>
+			<!-- /.login-card-body -->
+		</div>
 	</div>
-
-	@include('adminlte::layouts.partials.scripts_auth')
-</body>
+	<!-- /.login-box -->
 @endsection
\ No newline at end of file
