diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php
index 62e430616..5801187e0 100644
--- a/resources/views/settings/ldap.blade.php
+++ b/resources/views/settings/ldap.blade.php
@@ -70,7 +70,7 @@
                         <!-- Enable LDAP -->
                         <div class="form-group {{ $errors->has('ldap_integration') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_enabled', trans('admin/settings/general.ldap_integration')) }}
+                                <label for="ldap_enabled">{{ trans('admin/settings/general.ldap_integration') }}</label>
                             </div>
                             <div class="col-md-8">
 
@@ -92,7 +92,7 @@
                         <!-- AD Flag -->
                         <div class="form-group">
                             <div class="col-md-3">
-                                {{ Form::label('is_ad', trans('admin/settings/general.ad')) }}
+                                <label for="is_ad">{{ trans('admin/settings/general.ad') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <label class="form-control">
@@ -118,7 +118,7 @@
                         <!-- LDAP Password Sync -->
                         <div class="form-group">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_pw_sync', trans('admin/settings/general.ldap_pw_sync')) }}
+                                <label for="ldap_pw_sync">{{ trans('admin/settings/general.ldap_pw_sync') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <label class="form-control">
@@ -147,7 +147,7 @@
                         <!-- AD Domain -->
                         <div class="form-group {{ $errors->has('ad_domain') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ad_domain', trans('admin/settings/general.ad_domain')) }}
+                                <label for="ad_domain">{{ trans('admin/settings/general.ad_domain') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <input class="form-control" placeholder="{{ trans('general.example') .'example.com' }}" name="ad_domain" type="text" id="ad_domain" value="{{ old('ad_domain', $setting->ad_domain) }}">
@@ -200,7 +200,7 @@
                         <!-- LDAP Client-Side TLS certificate -->
                         <div class="form-group {{ $errors->has('ldap_client_tls_cert') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_client_tls_cert', trans('admin/settings/general.ldap_client_tls_cert')) }}
+                                <label for="ldap_client_tls_cert">{{ trans('admin/settings/general.ldap_client_tls_cert') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <x-input.textarea
@@ -228,7 +228,7 @@
                         <!-- LDAP Server -->
                         <div class="form-group {{ $errors->has('ldap_server') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_server', trans('admin/settings/general.ldap_server')) }}
+                                <label for="ldap_server">{{ trans('admin/settings/general.ldap_server') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <input class="form-control" placeholder="{{ trans('general.example') .'ldap://ldap.example.com' }}" name="ldap_server" type="text" id="ldap_server" value="{{ old('ldap_server', $setting->ldap_server) }}">
@@ -253,7 +253,7 @@
                         <!-- Start TLS -->
                         <div class="form-group">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_tls', trans('admin/settings/general.ldap_tls')) }}
+                                <label for="ldap_tls">{{ trans('admin/settings/general.ldap_tls') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <label class="form-control">
@@ -279,7 +279,7 @@
                         <!-- Ignore LDAP Certificate -->
                         <div class="form-group {{ $errors->has('ldap_server_cert_ignore') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_server_cert_ignore', trans('admin/settings/general.ldap_server_cert')) }}
+                                <label for="ldap_server_cert_ignore">{{ trans('admin/settings/general.ldap_server_cert') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <label class="form-control">
@@ -308,7 +308,7 @@
                         <!-- LDAP Username -->
                         <div class="form-group {{ $errors->has('ldap_uname') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_uname', trans('admin/settings/general.ldap_uname')) }}
+                                <label for="ldap_uname">{{ trans('admin/settings/general.ldap_uname') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <input class="form-control" autocomplete="off" placeholder="{{ trans('general.example') .'binduser@example.com' }}" name="ldap_uname" type="text" id="ldap_uname" value="{{ old('ldap_uname', $setting->ldap_uname) }}">
@@ -331,7 +331,7 @@
                         <!-- LDAP pword -->
                         <div class="form-group {{ $errors->has('ldap_pword') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_pword', trans('admin/settings/general.ldap_pword')) }}
+                                <label for="ldap_pword">{{ trans('admin/settings/general.ldap_pword') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <input class="form-control" type="password" name="ldap_pword" id="ldap_pword" value="" autocomplete="off" onfocus="this.removeAttribute('readonly');" readonly>
@@ -354,7 +354,7 @@
                         <!-- LDAP basedn -->
                         <div class="form-group {{ $errors->has('ldap_basedn') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_basedn', trans('admin/settings/general.ldap_basedn')) }}
+                                <label for="ldap_basedn">{{ trans('admin/settings/general.ldap_basedn') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <input class="form-control" placeholder="{{ trans('general.example') .'cn=users/authorized,dc=example,dc=com' }}" name="ldap_basedn" type="text" id="ldap_basedn" value="{{ old('ldap_basedn', $setting->ldap_basedn) }}">
@@ -377,7 +377,7 @@
                         <!-- LDAP filter -->
                         <div class="form-group {{ $errors->has('ldap_filter') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_filter', trans('admin/settings/general.ldap_filter')) }}
+                                <label for="ldap_filter">{{ trans('admin/settings/general.ldap_filter') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <input type="text" name="ldap_filter" id="ldap_filter" value="{{  old('ldap_filter', $setting->ldap_filter) }}" class="form-control" placeholder="{{  trans('general.example') .'&(cn=*)' }}">
@@ -400,7 +400,7 @@
                         <!-- LDAP  username field-->
                         <div class="form-group {{ $errors->has('ldap_username_field') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_username_field', trans('admin/settings/general.ldap_username_field')) }}
+                                <label for="ldap_username_field">{{ trans('admin/settings/general.ldap_username_field') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <input type="text" name="ldap_username_field" id="ldap_username_field" value="{{  old('ldap_username_field', $setting->ldap_username_field) }}" class="form-control" placeholder="{{  trans('general.example') .'samaccountname' }}">
@@ -423,7 +423,7 @@
                         <!-- LDAP Last Name Field -->
                         <div class="form-group {{ $errors->has('ldap_lname_field') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_lname_field', trans('admin/settings/general.ldap_lname_field')) }}
+                                <label for="ldap_lname_field">{{ trans('admin/settings/general.ldap_lname_field') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <input type="text" name="ldap_lname_field" id="ldap_lname_field" value="{{  old('ldap_lname_field', $setting->ldap_lname_field) }}" class="form-control" placeholder="{{  trans('general.example') .'sn' }}">
@@ -446,7 +446,7 @@
                         <!-- LDAP First Name field -->
                         <div class="form-group {{ $errors->has('ldap_fname_field') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_fname_field', trans('admin/settings/general.ldap_fname_field')) }}
+                                <label for="ldap_fname_field">{{ trans('admin/settings/general.ldap_fname_field') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <input type="text" name="ldap_fname_field" id="ldap_fname_field" value="{{  old('ldap_fname_field', $setting->ldap_fname_field) }}" class="form-control" placeholder="{{ trans('general.example') .'givenname'  }}">
@@ -494,7 +494,7 @@
 
                         <div class="form-group{{ $errors->has('group') ? ' has-error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_default_group', trans('admin/settings/general.ldap_default_group')) }}
+                                <label for="ldap_default_group">{{ trans('admin/settings/general.ldap_default_group') }}</label>
                             </div>
 
                             <div class="col-md-8">
@@ -534,7 +534,7 @@
                         <!-- LDAP active flag -->
                         <div class="form-group {{ $errors->has('ldap_active_flag') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_active_flag', trans('admin/settings/general.ldap_active_flag')) }}
+                                <label for="ldap_active_flag">{{ trans('admin/settings/general.ldap_active_flag') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <input type="text" name="ldap_active_flag" id="ldap_active_flag" value="{{  old('ldap_active_flag', $setting->ldap_active_flag) }}" class="form-control">
@@ -592,7 +592,7 @@
                         <!-- LDAP emp number -->
                         <div class="form-group {{ $errors->has('ldap_emp_num') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_emp_num', trans('admin/settings/general.ldap_emp_num')) }}
+                                <label for="ldap_emp_num">{{ trans('admin/settings/general.ldap_emp_num') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <input class="form-control" placeholder="{{ trans('general.example') .'employeenumber/employeeid' }}" name="ldap_emp_num" type="text" id="ldap_emp_num" value="{{ old('ldap_emp_num', $setting->ldap_emp_num) }}">
@@ -614,7 +614,7 @@
                         <!-- LDAP department -->
                         <div class="form-group {{ $errors->has('ldap_dept') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_dept', trans('admin/settings/general.ldap_dept')) }}
+                                <label for="ldap_dept">{{ trans('admin/settings/general.ldap_dept') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <input class="form-control" placeholder="{{ trans('general.example') .'department' }}" name="ldap_dept" type="text" id="ldap_dept" value="{{ old('ldap_dept', $setting->ldap_dept) }}">
@@ -637,7 +637,7 @@
                         <!-- LDAP Manager -->
                         <div class="form-group {{ $errors->has('ldap_dept') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_dept', trans('admin/settings/general.ldap_manager')) }}
+                                <label for="ldap_manager">{{ trans('admin/settings/general.ldap_manager') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <input class="form-control" placeholder=" {{ trans('general.example') .'manager' }}" name="ldap_manager" type="text" value="{{ old('ldap_manager', $setting->ldap_manager) }}">
@@ -660,7 +660,7 @@
                         <!-- LDAP email -->
                         <div class="form-group {{ $errors->has('ldap_email') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_email', trans('admin/settings/general.ldap_email')) }}
+                                <label for="ldap_email">{{ trans('admin/settings/general.ldap_email') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <input class="form-control" placeholder="{{ trans('general.example') .'mail' }}" name="ldap_email" type="text" id="ldap_email" value="{{ old('ldap_email', $setting->ldap_email) }}">
@@ -683,7 +683,7 @@
                         <!-- LDAP Phone -->
                         <div class="form-group {{ $errors->has('ldap_phone') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_phone', trans('admin/settings/general.ldap_phone')) }}
+                                <label for="ldap_phone">{{ trans('admin/settings/general.ldap_phone') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <input class="form-control" placeholder="{{ trans('general.example') .'telephonenumber' }}" name="ldap_phone" type="text" id="ldap_phone" value="{{ old('ldap_phone', $setting->ldap_phone_field) }}">
@@ -706,7 +706,7 @@
                         <!-- LDAP Job title -->
                         <div class="form-group {{ $errors->has('ldap_jobtitle') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_jobtitle', trans('admin/settings/general.ldap_jobtitle')) }}
+                                <label for="ldap_jobtitle">{{ trans('admin/settings/general.ldap_jobtitle') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <input class="form-control" placeholder="{{ trans('general.example') .'title' }}" name="ldap_jobtitle" type="text" id="ldap_jobtitle" value="{{ old('ldap_jobtitle', $setting->ldap_jobtitle) }}">
@@ -729,7 +729,7 @@
                         <!-- LDAP Country -->
                         <div class="form-group {{ $errors->has('ldap_country') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_country', trans('admin/settings/general.ldap_country')) }}
+                                <label for="ldap_country">{{ trans('admin/settings/general.ldap_country') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <input class="form-control" placeholder="{{ trans('general.example') .'c' }}" name="ldap_country" type="text" id="ldap_country" value="{{ old('ldap_country', $setting->ldap_country) }}">
@@ -751,7 +751,7 @@
                         <!-- LDAP Location -->
                         <div class="form-group {{ $errors->has('ldap_location') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('ldap_location', trans('admin/settings/general.ldap_location')) }}
+                                <label for="ldap_location">{{ trans('admin/settings/general.ldap_location') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <input class="form-control" placeholder="{{ trans('general.example') .'physicaldeliveryofficename' }}" name="ldap_location" type="text" id="ldap_location" value="{{ old('ldap_location', $setting->ldap_location) }}">
@@ -834,7 +834,7 @@
                         <!-- LDAP Forgotten password -->
                         <div class="form-group {{ $errors->has('custom_forgot_pass_url') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('custom_forgot_pass_url', trans('admin/settings/general.custom_forgot_pass_url')) }}
+                                <label for="custom_forgot_pass_url">{{ trans('admin/settings/general.custom_forgot_pass_url') }}</label>
                             </div>
                             <div class="col-md-8">
                                 <input class="form-control" placeholder="{{ trans('general.example') .'https://my.ldapserver-forgotpass.com' }}" name="custom_forgot_pass_url" type="text" id="custom_forgot_pass_url" value="{{ old('custom_forgot_pass_url', $setting->custom_forgot_pass_url) }}">