diff --git a/resources/views/themes/base/auth/passwords/change_password.blade.php b/resources/views/themes/base/auth/passwords/change_password.blade.php
index e7df713..b4c3848 100644
--- a/resources/views/themes/base/auth/passwords/change_password.blade.php
+++ b/resources/views/themes/base/auth/passwords/change_password.blade.php
@@ -21,24 +21,24 @@
                                 <div class="alert alert-danger">{{ $errors->first('email') }}</div>
                             @endif
 
-                            <div class="form-group row{{ $errors->has('password') ? ' has-danger' : '' }}">
+                            <div class="form-group row">
                                 <label for="password" class="col-md-4 col-form-label text-md-right">@lang('forms.password_label')</label>
 
                                 <div class="col-md-6">
-                                    <input id="password" type="password" class="form-control" name="password">
+                                    <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password">
 
                                     @if ($errors->has('password'))
-                                        <div class="form-control-feedback">
+                                        <div class="invalid-feedback">
                                             <strong>{{ $errors->first('password') }}</strong>
                                         </div>
                                     @endif
                                 </div>
                             </div>
 
-                            <div class="form-group row{{ $errors->has('password_confirmation') ? ' has-danger' : '' }}">
+                            <div class="form-group row">
                                 <label for="password-confirm" class="col-md-4 col-form-label text-md-right">@lang('forms.password_confirm_label')</label>
                                 <div class="col-md-6">
-                                    <input id="password-confirm" type="password" class="form-control" name="password_confirmation">
+                                    <input id="password-confirm" type="password" class="form-control{{ $errors->has('password_confirmation') ? ' is-invalid' : '' }}" name="password_confirmation">
 
                                     @if ($errors->has('password_confirmation'))
                                         <div class="form-control-feedback">
diff --git a/resources/views/themes/base/auth/passwords/reset.blade.php b/resources/views/themes/base/auth/passwords/reset.blade.php
index a84ff8d..7be99ed 100644
--- a/resources/views/themes/base/auth/passwords/reset.blade.php
+++ b/resources/views/themes/base/auth/passwords/reset.blade.php
@@ -19,41 +19,41 @@
 
                             <input type="hidden" name="token" value="{{ $token }}">
 
-                            <div class="form-group row{{ $errors->has('email') ? ' has-danger' : '' }}">
+                            <div class="form-group row">
                                 <label for="email" class="col-md-4 col-form-label text-md-right">@lang('forms.email_label')</label>
 
                                 <div class="col-md-6">
-                                    <input id="email" type="email" class="form-control" name="email" value="{{ $email or old('email') }}" autofocus>
+                                    <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ $email or old('email') }}" autofocus>
 
                                     @if ($errors->has('email'))
-                                        <div class="form-control-feedback">
+                                        <div class="invalid-feedback">
                                             <strong>{{ $errors->first('email') }}</strong>
                                         </div>
                                     @endif
                                 </div>
                             </div>
 
-                            <div class="form-group row{{ $errors->has('password') ? ' has-danger' : '' }}">
+                            <div class="form-group row">
                                 <label for="password" class="col-md-4 col-form-label text-md-right">@lang('forms.password_label')</label>
 
                                 <div class="col-md-6">
-                                    <input id="password" type="password" class="form-control" name="password">
+                                    <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password">
 
                                     @if ($errors->has('password'))
-                                        <div class="form-control-feedback">
+                                        <div class="invalid-feedback">
                                             <strong>{{ $errors->first('password') }}</strong>
                                         </div>
                                     @endif
                                 </div>
                             </div>
 
-                            <div class="form-group row{{ $errors->has('password_confirmation') ? ' has-danger' : '' }}">
+                            <div class="form-group row">
                                 <label for="password-confirm" class="col-md-4 col-form-label text-md-right">@lang('forms.password_confirm_label')</label>
                                 <div class="col-md-6">
-                                    <input id="password-confirm" type="password" class="form-control" name="password_confirmation">
+                                    <input id="password-confirm" type="password" class="form-control{{ $errors->has('password_confirmation') ? ' is-invalid' : '' }}" name="password_confirmation">
 
                                     @if ($errors->has('password_confirmation'))
-                                        <div class="form-control-feedback">
+                                        <div class="invalid-feedback">
                                             <strong>{{ $errors->first('password_confirmation') }}</strong>
                                         </div>
                                     @endif