diff --git a/resources/views/dashboard/user/profile/useraccount.blade.php b/resources/views/dashboard/user/profile/useraccount.blade.php
index fc6a7a8..1ffb360 100755
--- a/resources/views/dashboard/user/profile/useraccount.blade.php
+++ b/resources/views/dashboard/user/profile/useraccount.blade.php
@@ -263,30 +263,60 @@
                             </div>
                         @endif
 
-                        <h5 class="card-title">{{__('Change Password')}}</h5>
-                        <p class="card-text">{{__('Change your password here. This will log you out from all existing sessions for your security.')}}</p>
+                        @if (Auth::user()->hasDiscordConnection())
 
-                        <form method="POST" action="{{route('changePassword')}}" id="changePassword">
+                            <h5><i class="fab fa-discord"></i>  {{ __('Your :appName account is linked to Discord', ['appName' => config('app.name')]) }}</h5>
 
-                            @csrf
-                            @method('PATCH')
-                            <label for="oldpassword">{{__('Old Password')}}</label>
-                            <input class="form-control" name="oldPassword" type="password" id="oldpassword" autocomplete="current-password">
-                            <p class="text-sm text-muted">{!! __('Forgot password? Reset it <a href="/auth/password/reset">here</a>!') !!}</p>
+                            <p>{!! __('Your account is linked to Discord, which means you only need your Discord account credentials and two-factor code (if enabled) to sign in. If you would like to change your password, you will need to do so in your Discord account settings. Please <a href=":articleLink" target="_blank">read this article</a> to learn more.', ['articleLink' => 'https://support.discord.com/hc/en-us/articles/218410947-I-forgot-my-Password-Where-can-I-set-a-new-one-']) !!}</p>
 
-                            <div class="form-group mt-5">
+                            <p>{{ __('Alternatively, you can unlink your Discord account and set a password which you can use to sign in. Please note that any roles and/or privileges you may have been given as a result of this integration may be automatically removed until you link your Discord account again.') }}</p>
 
-                                <label for="newpassword">{{__('New Password')}}</label>
-                                <input type="password" name="newPassword" id="newpassword" class="form-control" autocomplete="new-password">
+                            <form method="POST" action="" id="setPassword">
+                                @csrf
+                                @method('PATCH')
 
-                                <label for="newpassword_confirmation">{{__('Confirm Password')}}</label>
-                                <input type="password" name="newPassword_confirmation" id="newpassword_confirmation" autocomplete="new-password" class="form-control">
+                                <p class="text-bold"><i class="fas fa-key"></i> {{ __('Setting a new password:') }}</p>
 
-                            </div>
+                                <div class="row">
+                                    <div class="col">
+                                        <label for="unlinkNewPassword">{{ __('New password') }}</label>
+                                        <input type="password" name="newpass" id="unlinkNewPassword" class="form-control">
+                                    </div>
 
-                        </form>
+                                    <div class="col">
+                                        <label for="unlinkConfirmNewPassword">{{ __('Confirm new password') }}</label>
+                                        <input type="password" name="newpass_confirm" if="unlinkConfirmNewPassword" class="form-control">
+                                    </div>
+                                </div>
 
-                        <button {{ ($demoActive) ? 'disabled' : '' }} class="btn btn-success" type="button" onclick="document.getElementById('changePassword').submit()">{{__('Change Password')}}</button>
+                                <button type="submit" class="btn btn-warning btn-md mt-4 mb-2"><i class="fas fa-check"></i> {{ __('Set password and unlink account') }}</button>
+                            </form>
+                            @else
+                                <h5 class="card-title">{{__('Change Password')}}</h5>
+                                <p class="card-text">{{__('Change your password here. This will log you out from all existing sessions for your security.')}}</p>
+
+                                <form method="POST" action="{{route('changePassword')}}" id="changePassword">
+
+                                    @csrf
+                                    @method('PATCH')
+                                    <label for="oldpassword">{{__('Old Password')}}</label>
+                                    <input class="form-control" name="oldPassword" type="password" id="oldpassword" autocomplete="current-password">
+                                    <p class="text-sm text-muted">{!! __('Forgot password? Reset it <a href="/auth/password/reset">here</a>!') !!}</p>
+
+                                    <div class="form-group mt-5">
+
+                                        <label for="newpassword">{{__('New Password')}}</label>
+                                        <input type="password" name="newPassword" id="newpassword" class="form-control" autocomplete="new-password">
+
+                                        <label for="newpassword_confirmation">{{__('Confirm Password')}}</label>
+                                        <input type="password" name="newPassword_confirmation" id="newpassword_confirmation" autocomplete="new-password" class="form-control">
+
+                                    </div>
+
+                                </form>
+
+                                <button {{ ($demoActive) ? 'disabled' : '' }} class="btn btn-success" type="button" onclick="document.getElementById('changePassword').submit()">{{__('Change Password')}}</button>
+                            @endif
                     </div>
                     <div class="tab-pane fade p-3" id="twofa" role="tabpanel" aria-labelledby="twofaTab">
                         <h5 class="card-title">{{__('Two Factor Authentication')}}</h5>