diff --git a/app/Console/Commands/LdapSync.php b/app/Console/Commands/LdapSync.php
index 88015b14a1..7ad4648702 100644
--- a/app/Console/Commands/LdapSync.php
+++ b/app/Console/Commands/LdapSync.php
@@ -55,6 +55,8 @@ class LdapSync extends Command
         ini_set('max_execution_time', env('LDAP_TIME_LIM', 600)); //600 seconds = 10 minutes
         ini_set('memory_limit', env('LDAP_MEM_LIM', '500M'));
 
+
+        // Map the LDAP attributes to the Snipe-IT user fields.
         $ldap_map = [
             "username" => Setting::getSettings()->ldap_username_field,
             "last_name" => Setting::getSettings()->ldap_lname_field,
@@ -63,11 +65,17 @@ class LdapSync extends Command
             "emp_num" => Setting::getSettings()->ldap_emp_num,
             "email" => Setting::getSettings()->ldap_email,
             "phone" => Setting::getSettings()->ldap_phone_field,
+            "mobile" => Setting::getSettings()->ldap_mobile,
             "jobtitle" => Setting::getSettings()->ldap_jobtitle,
+            "address" => Setting::getSettings()->ldap_address,
+            "city" => Setting::getSettings()->ldap_city,
+            "state" => Setting::getSettings()->ldap_state,
+            "zip" => Setting::getSettings()->ldap_zip,
             "country" => Setting::getSettings()->ldap_country,
             "location" => Setting::getSettings()->ldap_location,
             "dept" => Setting::getSettings()->ldap_dept,
             "manager" => Setting::getSettings()->ldap_manager,
+            "display_name" => Setting::getSettings()->ldap_display_name,
         ];
 
         $ldap_default_group = Setting::getSettings()->ldap_default_group;
@@ -234,9 +242,11 @@ class LdapSync extends Command
         }
 
 
+        // Assign the mapped LDAP attributes for each user to the Snipe-IT user fields
         for ($i = 0; $i < $results['count']; $i++) {
             $item = [];
             $item['username'] = $results[$i][$ldap_map["username"]][0] ?? '';
+            $item['display_name'] = $results[$i][$ldap_map["display_name"]][0] ?? '';
             $item['employee_number'] = $results[$i][$ldap_map["emp_num"]][0] ?? '';
             $item['lastname'] = $results[$i][$ldap_map["last_name"]][0] ?? '';
             $item['firstname'] = $results[$i][$ldap_map["first_name"]][0] ?? '';
@@ -244,8 +254,13 @@ class LdapSync extends Command
             $item['ldap_location_override'] = $results[$i]['ldap_location_override'] ?? '';
             $item['location_id'] = $results[$i]['location_id'] ?? '';
             $item['telephone'] = $results[$i][$ldap_map["phone"]][0] ?? '';
+            $item['mobile'] = $results[$i][$ldap_map["mobile"]][0] ?? '';
             $item['jobtitle'] = $results[$i][$ldap_map["jobtitle"]][0] ?? '';
+            $item['address'] = $results[$i][$ldap_map["ldap_address"]][0] ?? '';
+            $item['city'] = $results[$i][$ldap_map["city"]][0] ?? '';
+            $item['state'] = $results[$i][$ldap_map["state"]][0] ?? '';
             $item['country'] = $results[$i][$ldap_map["country"]][0] ?? '';
+            $item['zip'] = $results[$i][$ldap_map["zip"]][0] ?? '';
             $item['department'] = $results[$i][$ldap_map["dept"]][0] ?? '';
             $item['manager'] = $results[$i][$ldap_map["manager"]][0] ?? '';
             $item['location'] = $results[$i][$ldap_map["location"]][0] ?? '';
@@ -278,6 +293,9 @@ class LdapSync extends Command
             if($ldap_map["username"]  != null){
                 $user->username = $item['username'];
             }
+            if($ldap_map["display_name"]  != null){
+                $user->display_name = $item['display_name'];
+            }
             if($ldap_map["last_name"] != null){
                 $user->last_name = $item['lastname'];
             }
@@ -293,6 +311,9 @@ class LdapSync extends Command
             if($ldap_map["phone"] != null){
                 $user->phone = $item['telephone'];
             }
+            if($ldap_map["mobile"] != null){
+                $user->mobile = $item['mobile'];
+            }
             if($ldap_map["jobtitle"] != null){
                 $user->jobtitle = $item['jobtitle'];
             }
diff --git a/app/Http/Controllers/Api/SettingsController.php b/app/Http/Controllers/Api/SettingsController.php
index 134d24ef2a..3e48eb23f1 100644
--- a/app/Http/Controllers/Api/SettingsController.php
+++ b/app/Http/Controllers/Api/SettingsController.php
@@ -51,6 +51,7 @@ class SettingsController extends Controller
                 })->slice(0, 10)->map(function ($item) use ($settings) {
                     return (object) [
                         'username'        => $item[$settings['ldap_username_field']][0] ?? null,
+                        'display_name' => $item[$settings['ldap_display_name']][0] ?? null,
                         'employee_number' => $item[$settings['ldap_emp_num']][0] ?? null,
                         'lastname'        => $item[$settings['ldap_lname_field']][0] ?? null,
                         'firstname'       => $item[$settings['ldap_fname_field']][0] ?? null,
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index a0d9aeaa30..133937ed75 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -64,6 +64,7 @@ class UsersController extends Controller
             'users.jobtitle',
             'users.last_login',
             'users.last_name',
+            'users.display_name',
             'users.locale',
             'users.location_id',
             'users.manager_id',
@@ -154,6 +155,10 @@ class UsersController extends Controller
             $users = $users->where('users.last_name', '=', $request->input('last_name'));
         }
 
+        if ($request->filled('display_name')) {
+            $users = $users->where('users.display_name', '=', $request->input('display_name'));
+        }
+
         if ($request->filled('employee_num')) {
             $users = $users->where('users.employee_num', '=', $request->input('employee_num'));
         }
@@ -284,6 +289,7 @@ class UsersController extends Controller
                     [
                         'last_name',
                         'first_name',
+                        'display_name',
                         'email',
                         'jobtitle',
                         'username',
@@ -511,6 +517,10 @@ class UsersController extends Controller
                     $user->username = $request->input('username');
                 }
 
+                if ($request->filled('display_name')) {
+                    $user->display_name = $request->input('display_name');
+                }
+
                 if ($request->filled('email')) {
                     $user->email = $request->input('email');
                 }
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 56b36470d4..8c57efa5eb 100644
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -873,6 +873,7 @@ class SettingsController extends Controller
             $setting->ldap_default_group = $request->input('ldap_default_group');
             $setting->ldap_filter = $request->input('ldap_filter');
             $setting->ldap_username_field = $request->input('ldap_username_field');
+            $setting->ldap_display_name = $request->input('ldap_display_name');
             $setting->ldap_lname_field = $request->input('ldap_lname_field');
             $setting->ldap_fname_field = $request->input('ldap_fname_field');
             $setting->ldap_auth_filter_query = $request->input('ldap_auth_filter_query');
@@ -889,7 +890,12 @@ class SettingsController extends Controller
             $setting->ldap_pw_sync = $request->input('ldap_pw_sync', '0');
             $setting->custom_forgot_pass_url = $request->input('custom_forgot_pass_url');
             $setting->ldap_phone_field = $request->input('ldap_phone');
+            $setting->ldap_mobile = $request->input('ldap_mobile');
             $setting->ldap_jobtitle = $request->input('ldap_jobtitle');
+            $setting->ldap_address = $request->input('ldap_address');
+            $setting->ldap_city = $request->input('ldap_city');
+            $setting->ldap_state = $request->input('ldap_state');
+            $setting->ldap_zip = $request->input('ldap_zip');
             $setting->ldap_country = $request->input('ldap_country');
             $setting->ldap_location = $request->input('ldap_location');
             $setting->ldap_dept = $request->input('ldap_dept');
diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php
index 2275e565cb..35ef7d3e68 100755
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -88,6 +88,7 @@ class UsersController extends Controller
         //Username, email, and password need to be handled specially because the need to respect config values on an edit.
         $user->email = trim($request->input('email'));
         $user->username = trim($request->input('username'));
+        $user->display_name = $request->input('display_name');
         if ($request->filled('password')) {
             $user->password = bcrypt($request->input('password'));
         }
@@ -240,6 +241,7 @@ class UsersController extends Controller
 
         $user->first_name = $request->input('first_name');
         $user->last_name = $request->input('last_name');
+        $user->display_name = $request->input('display_name');
         $user->two_factor_optin = $request->input('two_factor_optin') ?: 0;
         $user->locale = $request->input('locale');
         $user->employee_num = $request->input('employee_num');
diff --git a/app/Http/Transformers/UsersTransformer.php b/app/Http/Transformers/UsersTransformer.php
index fb941007ab..a4c1cdfbc6 100644
--- a/app/Http/Transformers/UsersTransformer.php
+++ b/app/Http/Transformers/UsersTransformer.php
@@ -31,10 +31,11 @@ class UsersTransformer
         $array = [
                 'id' => (int) $user->id,
                 'avatar' => e($user->present()->gravatar) ?? null,
-                'name' => e($user->getFullNameAttribute()),
-                'first_name' => e($user->first_name),
-                'last_name' => e($user->last_name),
-                'username' => e($user->username),
+                'name' => e($user->getFullNameAttribute()) ?? null,
+                'first_name' => e($user->first_name) ?? null,
+                'last_name' => e($user->last_name) ?? null,
+                'display_name' => e($user->display_name) ?? null,
+                'username' => e($user->username) ?? null,
                 'remote' => ($user->remote == '1') ? true : false,
                 'locale' => ($user->locale) ? e($user->locale) : null,
                 'employee_num' => ($user->employee_num) ? e($user->employee_num) : null,
@@ -138,6 +139,7 @@ class UsersTransformer
             'first_name' => e($user->first_name),
             'last_name' => e($user->last_name),
             'username' => e($user->username),
+            'display_name' => e($user->display_name),
             'created_by' => $user->adminuser ? [
                 'id' => (int) $user->adminuser->id,
                 'name'=> e($user->adminuser->present()->fullName),
diff --git a/app/Importer/UserImporter.php b/app/Importer/UserImporter.php
index 633551c24d..942f1cf4a2 100644
--- a/app/Importer/UserImporter.php
+++ b/app/Importer/UserImporter.php
@@ -47,6 +47,7 @@ class UserImporter extends ItemImporter
         // Pull the records from the CSV to determine their values
         $this->item['id'] = trim($this->findCsvMatch($row, 'id'));
         $this->item['username'] = trim($this->findCsvMatch($row, 'username'));
+        $this->item['display_name'] = trim($this->findCsvMatch($row, 'display_name'));
         $this->item['first_name'] = trim($this->findCsvMatch($row, 'first_name'));
         $this->item['last_name'] = trim($this->findCsvMatch($row, 'last_name'));
         $this->item['email'] = trim($this->findCsvMatch($row, 'email'));
diff --git a/app/Livewire/Importer.php b/app/Livewire/Importer.php
index 6e6a6f1847..d86b2469c1 100644
--- a/app/Livewire/Importer.php
+++ b/app/Livewire/Importer.php
@@ -339,6 +339,7 @@ class Importer extends Component
             'start_date' => trans('general.start_date'),
             'state' => trans('general.state'),
             'username' => trans('admin/users/table.username'),
+            'display_name' => trans('admin/users/table.display_name'),
             'vip' => trans('general.importer.vip'),
             'website' => trans('general.website'),
             'zip' => trans('general.zip'),
@@ -485,6 +486,13 @@ class Importer extends Component
                     'username',
                     trans('general.importer.checked_out_to_username'),
                 ],
+            'display_name' =>
+                [
+                    'display name',
+                    'displayName',
+                    'display',
+                    trans('admin/users/table.display_name'),
+                ],
             'first_name' =>
                 [
                     'first name',
diff --git a/app/Models/SnipeModel.php b/app/Models/SnipeModel.php
index f300a22bd7..4cc5aa957d 100644
--- a/app/Models/SnipeModel.php
+++ b/app/Models/SnipeModel.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Helpers\Helper;
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 
 class SnipeModel extends Model
@@ -155,9 +156,19 @@ class SnipeModel extends Model
         $this->attributes['status_id'] = $value;
     }
 
-    //
-    public function getDisplayNameAttribute()
+    // This gets a little twitchy since *most* things have a property in the table called "name" (but users don't)
+    // AND we want to be able to use the actual display_name value from the database if it's set (usually via SCIM)
+    protected function displayNameAttribute(): Attribute
     {
-        return $this->name;
+        // This override should only kick in if the model has a display_name property (users)
+        if (isset($this->display_name)) {
+            return Attribute::make(
+                get: fn (string $value) => $this->display_name,
+            );
+        }
+        return Attribute::make(
+            get: fn (string $value) => $this->name,
+        );
     }
+
 }
diff --git a/app/Models/SnipeSCIMConfig.php b/app/Models/SnipeSCIMConfig.php
index c0d82dff43..5fce6ef292 100644
--- a/app/Models/SnipeSCIMConfig.php
+++ b/app/Models/SnipeSCIMConfig.php
@@ -34,6 +34,7 @@ class SnipeSCIMConfig extends \ArieTimmerman\Laravel\SCIMServer\SCIMConfig
 
             'validations' => [
                 $user_prefix . 'userName' => 'required',
+                $user_prefix . 'displayName' => 'nullable|string',
                 $user_prefix . 'name.givenName' => 'required',
                 $user_prefix . 'name.familyName' => 'nullable|string',
                 $user_prefix . 'externalId' => 'nullable|string',
@@ -121,7 +122,7 @@ class SnipeSCIMConfig extends \ArieTimmerman\Laravel\SCIMServer\SCIMConfig
                         'honorificSuffix' => null
                     ],
 
-                    'displayName' => null,
+                    'displayName' => AttributeMapping::eloquent("display_name"),
                     'nickName' => null,
                     'profileUrl' => null,
                     'title' => AttributeMapping::eloquent('jobtitle'),
diff --git a/app/Models/User.php b/app/Models/User.php
index 0c1cbe21fd..5374b5e284 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -64,6 +64,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         'first_name',
         'jobtitle',
         'last_name',
+        'display_name',
         'ldap_import',
         'locale',
         'location_id',
@@ -103,6 +104,8 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
 
     protected $rules = [
         'first_name'              => 'required|string|min:1|max:191',
+        'last_name'               => 'nullable|string|max:191',
+        'display_name'            => 'nullable|string|max:191',
         'username'                => 'required|string|min:1|unique_undeleted|max:191',
         'email'                   => 'email|nullable|max:191',
         'password'                => 'required|min:8',
@@ -113,9 +116,9 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         'start_date'              => 'nullable|date_format:Y-m-d',
         'end_date'                => 'nullable|date_format:Y-m-d|after_or_equal:start_date',
         'autoassign_licenses'     => 'boolean',
-        'address'                 => 'max:191|nullable',
-        'city'                    => 'max:191|nullable',
-        'state'                   => 'min:2|max:191|nullable',
+        'address'                 => 'nullable|string|max:191',
+        'city'                    => 'nullable|string|max:191',
+        'state'                   => 'nullable|string|max:191',
         'country'                 => 'min:2|max:191|nullable',
         'zip'                     => 'max:10|nullable',
         'vip'                     => 'boolean',
@@ -132,15 +135,16 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         'address',
         'city',
         'country',
+        'display_name',
         'email',
         'employee_num',
         'first_name',
         'jobtitle',
         'last_name',
         'locale',
+        'mobile',
         'notes',
         'phone',
-        'mobile',
         'state',
         'username',
         'website',
@@ -157,7 +161,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         'department' => ['name'],
         'groups'     => ['name'],
         'company'    => ['name'],
-        'manager'    => ['first_name', 'last_name', 'username'],
+        'manager'    => ['first_name', 'last_name', 'username', 'display_name'],
     ];
 
 
@@ -859,6 +863,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
     {
         return $query->where('first_name', 'LIKE', '%' . $search . '%')
             ->orWhere('last_name', 'LIKE', '%' . $search . '%')
+            ->orWhere('display_name', 'LIKE', '%' . $search . '%')
             ->orWhereMultipleColumns(
                 [
                 'users.first_name',
@@ -1068,6 +1073,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
             ->orWhere('users.jobtitle', 'LIKE', '%' . $search . '%')
             ->orWhere('users.employee_num', 'LIKE', '%' . $search . '%')
             ->orWhere('users.username', 'LIKE', '%' . $search . '%')
+            ->orWhere('users.display_name', 'LIKE', '%' . $search . '%')
             ->orwhereRaw('CONCAT(users.first_name," ",users.last_name) LIKE \''.$search.'%\'');
 
     }
diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php
index c60457ea05..8eb28091c5 100644
--- a/app/Presenters/UserPresenter.php
+++ b/app/Presenters/UserPresenter.php
@@ -79,6 +79,14 @@ class UserPresenter extends Presenter
                 'visible' => false,
                 'formatter' => 'usersLinkFormatter',
             ],
+            [
+                'field' => 'display_name',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => false,
+                'title' => trans('admin/users/table.display_name'),
+                'visible' => true,
+            ],
             [
                 'field' => 'jobtitle',
                 'searchable' => true,
@@ -191,6 +199,7 @@ class UserPresenter extends Presenter
                 'visible' => true,
                 'formatter' => 'usernameRoleLinkFormatter',
             ],
+
             [
                 'field' => 'employee_num',
                 'searchable' => true,
@@ -449,6 +458,9 @@ class UserPresenter extends Presenter
      */
     public function fullName()
     {
+        if ($this->display_name) {
+            return html_entity_decode($this->display_name, ENT_QUOTES | ENT_XML1, 'UTF-8');
+        }
         return html_entity_decode($this->first_name.' '.$this->last_name, ENT_QUOTES | ENT_XML1, 'UTF-8');
     }
 
diff --git a/database/migrations/2025_08_19_114742_add_display_name_to_users.php b/database/migrations/2025_08_19_114742_add_display_name_to_users.php
new file mode 100644
index 0000000000..d55e755d3a
--- /dev/null
+++ b/database/migrations/2025_08_19_114742_add_display_name_to_users.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            if (!Schema::hasColumn('users', 'display_name')) {
+                $table->text('display_name')->after('last_name')->nullable()->default(null);
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            if (Schema::hasColumn('users', 'display_name')) {
+                $table->dropColumn('display_name');
+            }
+        });
+    }
+};
diff --git a/database/migrations/2025_08_19_174823_add_display_name_to_ldap_settings.php b/database/migrations/2025_08_19_174823_add_display_name_to_ldap_settings.php
new file mode 100644
index 0000000000..fb980af6dd
--- /dev/null
+++ b/database/migrations/2025_08_19_174823_add_display_name_to_ldap_settings.php
@@ -0,0 +1,82 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+
+            if (!Schema::hasColumn('settings', 'ldap_display_name')) {
+                $table->string('ldap_display_name', 191)->after('ldap_fname_field')->nullable()->default(null);
+            }
+
+            if (!Schema::hasColumn('settings', 'ldap_zip')) {
+                $table->string('ldap_zip', 191)->after('ldap_manager')->nullable()->default(null);
+            }
+
+            if (!Schema::hasColumn('settings', 'ldap_state')) {
+                $table->string('ldap_state', 191)->after('ldap_manager')->nullable()->default(null);
+            }
+
+            if (!Schema::hasColumn('settings', 'ldap_city')) {
+                $table->string('ldap_city', 191)->after('ldap_manager')->nullable()->default(null);
+            }
+
+            if (!Schema::hasColumn('settings', 'ldap_address')) {
+                $table->string('ldap_address', 191)->after('ldap_manager')->nullable()->default(null);
+            }
+
+            if (!Schema::hasColumn('settings', 'ldap_mobile')) {
+                $table->string('ldap_mobile', 191)->after('ldap_phone_field')->nullable()->default(null);
+            }
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            if (Schema::hasColumn('settings', 'ldap_display_name')) {
+                $table->dropColumn('ldap_display_name');
+            }
+        });
+
+        Schema::table('settings', function (Blueprint $table) {
+            if (Schema::hasColumn('settings', 'ldap_zip')) {
+                $table->dropColumn('ldap_zip');
+            }
+        });
+        Schema::table('settings', function (Blueprint $table) {
+            if (Schema::hasColumn('settings', 'ldap_address')) {
+                $table->dropColumn('ldap_address');
+            }
+        });
+        Schema::table('settings', function (Blueprint $table) {
+            if (Schema::hasColumn('settings', 'ldap_city')) {
+                $table->dropColumn('ldap_city');
+            }
+        });
+        Schema::table('settings', function (Blueprint $table) {
+            if (Schema::hasColumn('settings', 'ldap_state')) {
+                $table->dropColumn('ldap_state');
+            }
+        });
+        Schema::table('settings', function (Blueprint $table) {
+            if (Schema::hasColumn('settings', 'ldap_mobile')) {
+                $table->dropColumn('ldap_mobile');
+            }
+        });
+
+
+    }
+};
diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php
index 4e8143a517..842fe5e338 100644
--- a/resources/lang/en-US/admin/settings/general.php
+++ b/resources/lang/en-US/admin/settings/general.php
@@ -93,11 +93,11 @@ return [
     'ldap_integration'          => 'LDAP Integration',
     'ldap_settings'             => 'LDAP Settings',
     'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
-    'ldap_location'             => 'LDAP Location',
-'ldap_location_help'             => 'The Ldap Location field should be used if <strong>an OU is not being used in the Base Bind DN.</strong> Leave this blank if an OU search is being used.',
+    'ldap_location'             => 'LDAP Location Field',
+'ldap_location_help'             => 'The LDAP Location field should be used if <strong>an OU is not being used in the Base Bind DN.</strong> Leave this blank if an OU search is being used.',
     'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
-    'ldap_manager'              => 'LDAP Manager',
+    'ldap_manager'              => 'LDAP Manager Field',
     'ldap_server'               => 'LDAP Server',
     'ldap_server_help'          => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
     'ldap_server_cert'			=> 'LDAP SSL certificate validation',
@@ -106,26 +106,32 @@ return [
     'ldap_tls'                  => 'Use TLS',
     'ldap_tls_help'             => 'This should be checked only if you are running STARTTLS on your LDAP server. ',
     'ldap_uname'                => 'LDAP Bind Username',
-    'ldap_dept'                 => 'LDAP Department',
-    'ldap_phone'                => 'LDAP Telephone Number',
-    'ldap_jobtitle'             => 'LDAP Job Title',
-    'ldap_country'              => 'LDAP Country',
+    'ldap_dept'                 => 'LDAP Department Field',
+    'ldap_phone'                => 'LDAP Phone Number Field',
+    'ldap_jobtitle'             => 'LDAP Job Title Field',
+    'ldap_country'              => 'LDAP Country Field',
     'ldap_pword'                => 'LDAP Bind Password',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
     'ldap_pw_sync'              => 'Cache LDAP Passwords',
     'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords cached as local hashed passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
-    'ldap_username_field'       => 'Username Field',
-    'ldap_lname_field'          => 'Last Name',
-    'ldap_fname_field'          => 'LDAP First Name',
+    'ldap_username_field'       => 'LDAP Username Field',
+    'ldap_display_name'          => 'LDAP Display Name Field',
+    'ldap_lname_field'          => 'LDAP Last Name Field',
+    'ldap_fname_field'          => 'LDAP First Name Field',
     'ldap_auth_filter_query'    => 'LDAP Authentication query',
     'ldap_version'              => 'LDAP Version',
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_activated_flag_help'  => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
     'ldap_invert_active_flag'   => 'LDAP Invert Active Flag',
     'ldap_invert_active_flag_help'     => 'If enabled: when the value returned by LDAP Active Flag is <code>0</code> or <code>false</code> the user account will be active.',
-    'ldap_emp_num'              => 'LDAP Employee Number',
-    'ldap_email'                => 'LDAP Email',
+    'ldap_emp_num'              => 'LDAP Employee Number Field',
+    'ldap_email'                => 'LDAP Email Field',
+    'ldap_mobile'               => 'LDAP Mobile Field',
+    'ldap_address'              => 'LDAP Address Field',
+    'ldap_city'                 => 'LDAP City Field',
+    'ldap_state'                => 'LDAP State/Province Field',
+    'ldap_zip'                  => 'LDAP Postal Code Field',
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Software License',
@@ -462,21 +468,24 @@ return [
 
 
     'legends' => [
-        'scoping' => 'Scoping',
-        'formats' => 'Default Formats',
-        'profiles' => 'User Profiles',
-        'eula' => 'EULA & Acceptance Preferences',
-        'misc_display' => 'Miscellaneous Display Options',
-        'email' => 'Email Preferences',
         'checkin' => 'Checkin Preferences',
-        'dashboard' => 'Login & Dashboard Preferences',
-        'misc' => 'Miscellaneous',
-        'logos' => 'Logos & Display',
         'colors' => 'Colors & Skins',
+        'dashboard' => 'Login & Dashboard Preferences',
+        'email' => 'Email Preferences',
+        'eula' => 'EULA & Acceptance Preferences',
         'footer' => 'Footer Preferences',
-        'security' => 'Security Preferences',
+        'formats' => 'Default Formats',
         'general' => 'General',
         'intervals' => 'Intervals & Thresholds',
+        'logos' => 'Logos & Display',
+        'mapping' => 'LDAP Field Mapping',
+        'test' => 'Test LDAP Connection',
+        'misc' => 'Miscellaneous',
+        'misc_display' => 'Miscellaneous Display Options',
+        'profiles' => 'User Profiles',
+        'server' => 'Server Settings',
+        'scoping' => 'Scoping',
+        'security' => 'Security Preferences',
     ],
 
 
diff --git a/resources/lang/en-US/admin/users/table.php b/resources/lang/en-US/admin/users/table.php
index e7a5aa6490..2e2f9c7995 100644
--- a/resources/lang/en-US/admin/users/table.php
+++ b/resources/lang/en-US/admin/users/table.php
@@ -35,6 +35,7 @@ return array(
     'total_assets_cost'     => "Total Assets Cost",
     'updateuser' 			=> 'Update User',
     'username' 				=> 'Username',
+    'display_name' 			=> 'Display Name',
 	'user_deleted_text' 	=> 'This user has been marked as deleted.',
     'username_note' 		=> '(This is used for Active Directory binding only, not for login.)',
     'cloneuser'             => 'Clone User',
diff --git a/resources/views/modals/user.blade.php b/resources/views/modals/user.blade.php
index 04d0c82357..e9b83fc5ae 100644
--- a/resources/views/modals/user.blade.php
+++ b/resources/views/modals/user.blade.php
@@ -79,6 +79,18 @@
                          </div>
                     </div>
 
+                    <div class="dynamic-form-row">
+                        <div class="form-group">
+                            <div class="col-md-3 col-xs-12 ">
+                                <label class="control-label" for="modal-display_name">{{ trans('admin/users/table.display_name') }}:</label>
+                            </div>
+                            <div class="col-md-8 col-xs-12">
+                                <input class="form-control" type='text' name="display_name" id='modal-display_name' required>
+
+                            </div>
+                        </div>
+                    </div>
+
 					<!-- Checkbox for activation new user, by default set for activated -->
 					<div class="dynamic-form-row">
                         <div class="form-group">
diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php
index 27e6a20dea..19051f653b 100644
--- a/resources/views/settings/ldap.blade.php
+++ b/resources/views/settings/ldap.blade.php
@@ -65,728 +65,357 @@
                 </div>
                 <div class="box-body">
 
-                    <div class="col-md-11 col-md-offset-1">
+                    <div class="col-md-12">
 
-                        <!-- Enable LDAP -->
-                        <div class="form-group {{ $errors->has('ldap_integration') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <label for="ldap_enabled">{{ trans('admin/settings/general.ldap_integration') }}</label>
-                            </div>
-                            <div class="col-md-8">
+                        <fieldset class="bottom-padded">
+                            <legend class="highlight">
+                                {{ trans('admin/settings/general.legends.server') }}
+                            </legend>
+                                <!-- Enable LDAP -->
+                                <div class="form-group {{ $errors->has('ldap_integration') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <label for="ldap_enabled">{{ trans('admin/settings/general.ldap_integration') }}</label>
+                                    </div>
+                                    <div class="col-md-8">
 
-                                <label class="form-control">
-                                    <input type="checkbox" name="ldap_enabled" value="1" id="ldap_enabled" @checked(old('ldap_enabled', $setting->ldap_enabled)) />
-                                {{ trans('admin/settings/general.ldap_enabled') }}
-                                </label>
+                                        <label class="form-control">
+                                            <input type="checkbox" name="ldap_enabled" value="1" id="ldap_enabled" @checked(old('ldap_enabled', $setting->ldap_enabled)) />
+                                        {{ trans('admin/settings/general.ldap_enabled') }}
+                                        </label>
 
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div>
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {{ trans('general.feature_disabled') }}
+                                            </p>
+                                        @endif
+                                    </div>
+                                </div>
 
 
-                        <!-- AD Flag -->
-                        <div class="form-group">
-                            <div class="col-md-3">
-                                <label for="is_ad">{{ trans('admin/settings/general.ad') }}</label>
-                            </div>
-                            <div class="col-md-8">
-                                <label class="form-control">
-                                    <input type="checkbox" name="is_ad" value="1" id="is_ad" @checked(old('is_ad', $setting->is_ad))/>
-                                {{ trans('admin/settings/general.is_ad') }}
-                                </label>
-                                @error('is_ad')
-                                    <span class="alert-msg">
-                                         <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
-
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div>
-
-                        <!-- LDAP Password Sync -->
-                        <div class="form-group">
-                            <div class="col-md-3">
-                                <label for="ldap_pw_sync">{{ trans('admin/settings/general.ldap_pw_sync') }}</label>
-                            </div>
-                            <div class="col-md-8">
-                                <label class="form-control">
-                                    <input type="checkbox" name="ldap_pw_sync" value="1" id="ldap_pw_sync" @checked(old('ldap_pw_sync', $setting->ldap_pw_sync)) />
-                                {{ trans('general.yes') }}
-                                </label>
-
-                                <p class="help-block">{{ trans('admin/settings/general.ldap_pw_sync_help') }}</p>
-                                @error('ldap_pw_sync')
-                                    <span class="alert-msg">
-                                         <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
-
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-
-                            </div>
-                        </div>
-
-                        <!-- AD Domain -->
-                        <div class="form-group {{ $errors->has('ad_domain') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <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) }}">
-                                <p class="help-block">{{ trans('admin/settings/general.ad_domain_help') }}</p>
-                                @error('ad_domain')
-                                    <span class="alert-msg">
-                                         <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
-
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div><!-- AD Domain -->
-
-                        <!-- LDAP Client-Side TLS key -->
-                        <div class="form-group {{ $errors->has('ldap_client_tls_key') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <label for="ldap_client_tls_key">
-                                    {{ trans('admin/settings/general.ldap_client_tls_key') }}
-                                </label>
-                            </div>
-                            <div class="col-md-8">
-                                <x-input.textarea
-                                    name="ldap_client_tls_key"
-                                    value="{{ old('ldap_client_tls_key', $setting->ldap_client_tls_key) }}"
-                                    :placeholder="sprintf('%s-----BEGIN RSA PRIVATE KEY-----%s1234567890%s-----END RSA PRIVATE KEY-----', trans('general.example'), PHP_EOL, PHP_EOL)"
-                                />
-                                @error('ldap_client_tls_key')
-                                    <span class="alert-msg">
-                                         <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
-
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div><!-- LDAP Client-Side TLS key -->
-
-                        <!-- LDAP Client-Side TLS certificate -->
-                        <div class="form-group {{ $errors->has('ldap_client_tls_cert') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <label for="ldap_client_tls_cert">{{ trans('admin/settings/general.ldap_client_tls_cert') }}</label>
-                            </div>
-                            <div class="col-md-8">
-                                <x-input.textarea
-                                    name="ldap_client_tls_cert"
-                                    value="{{ old('ldap_client_tls_cert', $setting->ldap_client_tls_cert) }}"
-                                    :placeholder="sprintf('%s-----BEGIN CERTIFICATE-----%s1234567890%s-----END CERTIFICATE-----', trans('general.example'), PHP_EOL, PHP_EOL)"
-                                />
-                                <p class="help-block">{{ trans('admin/settings/general.ldap_client_tls_cert_help') }}</p>
-                                @error('ldap_client_tls_cert')
-                                    <span class="alert-msg">
-                                       <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
-
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div><!-- LDAP Client-Side TLS certificate -->
-
-                        <!-- LDAP Server -->
-                        <div class="form-group {{ $errors->has('ldap_server') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <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) }}">
-                                @error('ldap_server')
-                                    <span class="alert-msg">
-                                        <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
-
-                                <p class="help-block">{{ trans('admin/settings/general.ldap_server_help') }}</p>
-
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div><!-- LDAP Server -->
-
-                        <!-- Start TLS -->
-                        <div class="form-group">
-                            <div class="col-md-3">
-                                <label for="ldap_tls">{{ trans('admin/settings/general.ldap_tls') }}</label>
-                            </div>
-                            <div class="col-md-8">
-                                <label class="form-control">
-                                    <input type="checkbox" name="ldap_tls" value="1" id="ldap_tls" @checked(old('ldap_tls', $setting->ldap_tls)) />
-                                    {{ trans('admin/settings/general.ldap_tls_help') }}
-                                </label>
-                                @error('ldap_tls')
-                                    <span class="alert-msg">
-                                         <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
-
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div>
-
-                        <!-- Ignore LDAP Certificate -->
-                        <div class="form-group {{ $errors->has('ldap_server_cert_ignore') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <label for="ldap_server_cert_ignore">{{ trans('admin/settings/general.ldap_server_cert') }}</label>
-                            </div>
-                            <div class="col-md-8">
-                                <label class="form-control">
-                                    <input type="checkbox" name="ldap_server_cert_ignore" value="1" id="ldap_server_cert_ignore" @checked(old('ldap_server_cert_ignore', $setting->ldap_server_cert_ignore)) />
-                                    {{ trans('admin/settings/general.ldap_server_cert_ignore') }}
-                                </label>
-                                @error('ldap_server_cert_ignore')
-                                    <span class="alert-msg">
-                                         <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
-
-                                <p class="help-block">
-                                    {{ trans('admin/settings/general.ldap_server_cert_help') }}
-                                </p>
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div>
-
-                        <!-- LDAP Username -->
-                        <div class="form-group {{ $errors->has('ldap_uname') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <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) }}">
-                                @error('ldap_uname')
-                                    <span class="alert-msg">
-                                         <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
-
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div>
-
-                        <!-- LDAP pword -->
-                        <div class="form-group {{ $errors->has('ldap_pword') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <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>
-                                @error('ldap_pword')
-                                    <span class="alert-msg">
-                                         <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
-
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div>
-
-                        <!-- LDAP basedn -->
-                        <div class="form-group {{ $errors->has('ldap_basedn') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <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) }}">
-                                @error('ldap_basedn')
-                                    <span class="alert-msg">
-                                        <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
-
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div>
-
-                        <!-- LDAP filter -->
-                        <div class="form-group {{ $errors->has('ldap_filter') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <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=*)' }}">
-                                @error('ldap_filter')
-                                    <span class="alert-msg">
-                                        <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
-
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div>
-
-                        <!-- LDAP  username field-->
-                        <div class="form-group {{ $errors->has('ldap_username_field') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <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' }}">
-                                @error('ldap_username_field')
-                                    <span class="alert-msg">
-                                        <x-icon type="x" />
-                                        {!! $message !!}
-                                    </span>
-                                @enderror
-
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div>
-
-                        <!-- LDAP Last Name Field -->
-                        <div class="form-group {{ $errors->has('ldap_lname_field') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <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' }}">
-                                @error('ldap_lname_field')
-                                    <span class="alert-msg">
-                                        <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
-
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div>
-
-                        <!-- LDAP First Name field -->
-                        <div class="form-group {{ $errors->has('ldap_fname_field') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <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'  }}">
-                                @error('ldap_fname_field')
-                                    <span class="alert-msg">
-                                        <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
-
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div>
-
-                        <!-- LDAP Auth Filter Query -->
-                        <div class="form-group {{ $errors->has('ldap_auth_filter_query') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <label for="ldap_auth_filter_query">{{ trans('admin/settings/general.ldap_auth_filter_query') }}</label>
-                            </div>
-                            <div class="col-md-8">
-
-                                <input type="text" name="ldap_auth_filter_query" id="ldap_auth_filter_query" value="{{  old('ldap_auth_filter_query', $setting->ldap_auth_filter_query) }}" class="form-control" placeholder="{{ trans('general.example') .'uid='  }}">
-                                @error('ldap_auth_filter_query')
-                                    <span class="alert-msg">
-                                        <x-icon type="x" />
-                                        {!! $message !!}
-                                    </span>
-                                @enderror
-
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div>
-
-                        <!--  Default LDAP Permissions Group Select -->
-
-                        <div class="form-group{{ $errors->has('group') ? ' has-error' : '' }}">
-                            <div class="col-md-3">
-                                <label for="ldap_default_group">{{ trans('admin/settings/general.ldap_default_group') }}</label>
-                            </div>
-
-                            <div class="col-md-8">
-
-                                @if ($groups->count())
-                                    @if ((Config::get('app.lock_passwords') || (!Auth::user()->isSuperUser())))
-                                        <ul>
-                                            @foreach ($groups as $id => $group)
-                                                {!! '<li>'.e($group).'</li>' !!}
-                                            @endforeach
-                                        </ul>
-
-                                        <span class="help-block">{{ trans('admin/users/general.group_memberships_helpblock') }}</span>
-                                    @else
-                                        <div class="controls">
-                                            <select name="ldap_default_group" aria-label="ldap_default_group" id="ldap_default_group" class="form-control select2">
-                                                <option value="">{{ trans('admin/settings/general.no_default_group') }}</option>
-                                                @foreach ($groups as $id => $group)
-                                                    <option value="{{ $id }}" {{ $setting->ldap_default_group == $id ? 'selected' : '' }}>
-                                                        {{ $group }}
-                                                    </option>
-                                                @endforeach
-                                            </select>
-
-                                            <span class="help-block">
-                                                {{ trans('admin/settings/general.ldap_default_group_info') }}
+                                <!-- AD Flag -->
+                                <div class="form-group">
+                                    <div class="col-md-3">
+                                        <label for="is_ad">{{ trans('admin/settings/general.ad') }}</label>
+                                    </div>
+                                    <div class="col-md-8">
+                                        <label class="form-control">
+                                            <input type="checkbox" name="is_ad" value="1" id="is_ad" @checked(old('is_ad', $setting->is_ad))/>
+                                        {{ trans('admin/settings/general.is_ad') }}
+                                        </label>
+                                        @error('is_ad')
+                                            <span class="alert-msg">
+                                                 <x-icon type="x" />
+                                                {{ $message }}
                                             </span>
-                                        </div>
-                                    @endif
-                                @else
-                                    <p>{!! trans('admin/settings/general.no_groups') !!}</p>
-                                @endif
+                                        @enderror
 
-                            </div>
-                        </div>
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {{ trans('general.feature_disabled') }}
+                                            </p>
+                                        @endif
+                                    </div>
+                                </div>
 
-                        <!-- LDAP active flag -->
-                        <div class="form-group {{ $errors->has('ldap_active_flag') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <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">
-                                <p class="help-block">{!! trans('admin/settings/general.ldap_activated_flag_help') !!}</p>
+                                <!-- LDAP Password Sync -->
+                                <div class="form-group">
+                                    <div class="col-md-3">
+                                        <label for="ldap_pw_sync">{{ trans('admin/settings/general.ldap_pw_sync') }}</label>
+                                    </div>
+                                    <div class="col-md-8">
+                                        <label class="form-control">
+                                            <input type="checkbox" name="ldap_pw_sync" value="1" id="ldap_pw_sync" @checked(old('ldap_pw_sync', $setting->ldap_pw_sync)) />
+                                        {{ trans('general.yes') }}
+                                        </label>
 
-                                @error('ldap_active_flag')
-                                    <span class="alert-msg">
-                                        <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
+                                        <p class="help-block">{{ trans('admin/settings/general.ldap_pw_sync_help') }}</p>
+                                        @error('ldap_pw_sync')
+                                            <span class="alert-msg">
+                                                 <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
 
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div>
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {{ trans('general.feature_disabled') }}
+                                            </p>
+                                        @endif
 
-                        <!-- LDAP invert active flag -->
-                        <div class="form-group">
-                            <div class="col-md-3">
-                                <label for="ldap_invert_active_flag">
-                                    {{ trans('admin/settings/general.ldap_invert_active_flag') }}
-                                </label>
-                            </div>
-                            <div class="col-md-8">
-                                <label class="form-control">
-                                    <input type="checkbox" name="ldap_invert_active_flag" value="1" id="ldap_invert_active_flag" @checked(old('ldap_invert_active_flag', $setting->ldap_invert_active_flag)) />
-                                    {{ trans('general.yes') }}
-                                </label>
-                                @error('ldap_invert_active_flag')
-                                <span class="alert-msg">
-                                         <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
+                                    </div>
+                                </div>
 
-                                <p class="help-block">
-                                    {!! trans('admin/settings/general.ldap_invert_active_flag_help') !!}
-                                </p>
+                                <!-- AD Domain -->
+                                <div class="form-group {{ $errors->has('ad_domain') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <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) }}">
+                                        <p class="help-block">{{ trans('admin/settings/general.ad_domain_help') }}</p>
+                                        @error('ad_domain')
+                                            <span class="alert-msg">
+                                                 <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
 
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {!! trans('general.feature_disabled') !!}
-                                    </p>
-                                @endif
-                            </div>
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {{ trans('general.feature_disabled') }}
+                                            </p>
+                                        @endif
+                                    </div>
+                                </div><!-- AD Domain -->
 
-                        </div>
+                                <!-- LDAP Client-Side TLS key -->
+                                <div class="form-group {{ $errors->has('ldap_client_tls_key') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <label for="ldap_client_tls_key">
+                                            {{ trans('admin/settings/general.ldap_client_tls_key') }}
+                                        </label>
+                                    </div>
+                                    <div class="col-md-8">
+                                        <x-input.textarea
+                                            name="ldap_client_tls_key"
+                                            value="{{ old('ldap_client_tls_key', $setting->ldap_client_tls_key) }}"
+                                            :placeholder="sprintf('%s-----BEGIN RSA PRIVATE KEY-----%s1234567890%s-----END RSA PRIVATE KEY-----', trans('general.example'), PHP_EOL, PHP_EOL)"
+                                        />
+                                        @error('ldap_client_tls_key')
+                                            <span class="alert-msg">
+                                                 <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
 
-                        <!-- LDAP emp number -->
-                        <div class="form-group {{ $errors->has('ldap_emp_num') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <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) }}">
-                                @error('ldap_emp_num')
-                                    <span class="alert-msg">
-                                        <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {{ trans('general.feature_disabled') }}
+                                            </p>
+                                        @endif
+                                    </div>
+                                </div><!-- LDAP Client-Side TLS key -->
 
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div>
-                        <!-- LDAP department -->
-                        <div class="form-group {{ $errors->has('ldap_dept') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <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) }}">
+                                <!-- LDAP Client-Side TLS certificate -->
+                                <div class="form-group {{ $errors->has('ldap_client_tls_cert') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <label for="ldap_client_tls_cert">{{ trans('admin/settings/general.ldap_client_tls_cert') }}</label>
+                                    </div>
+                                    <div class="col-md-8">
+                                        <x-input.textarea
+                                            name="ldap_client_tls_cert"
+                                            value="{{ old('ldap_client_tls_cert', $setting->ldap_client_tls_cert) }}"
+                                            :placeholder="sprintf('%s-----BEGIN CERTIFICATE-----%s1234567890%s-----END CERTIFICATE-----', trans('general.example'), PHP_EOL, PHP_EOL)"
+                                        />
+                                        <p class="help-block">{{ trans('admin/settings/general.ldap_client_tls_cert_help') }}</p>
+                                        @error('ldap_client_tls_cert')
+                                            <span class="alert-msg">
+                                               <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
 
-                                @error('ldap_dept')
-                                    <span class="alert-msg">
-                                        <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {{ trans('general.feature_disabled') }}
+                                            </p>
+                                        @endif
+                                    </div>
+                                </div><!-- LDAP Client-Side TLS certificate -->
 
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div>
-                        <!-- LDAP Manager -->
-                        <div class="form-group {{ $errors->has('ldap_dept') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <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) }}">
-                                @error('ldap_manager')
-                                    <span class="alert-msg">
-                                        <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
+                                <!-- LDAP Server -->
+                                <div class="form-group {{ $errors->has('ldap_server') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <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) }}">
+                                        @error('ldap_server')
+                                            <span class="alert-msg">
+                                                <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
 
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div>
+                                        <p class="help-block">{{ trans('admin/settings/general.ldap_server_help') }}</p>
 
-                        <!-- LDAP email -->
-                        <div class="form-group {{ $errors->has('ldap_email') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <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) }}">
-                                @error('ldap_email')
-                                    <span class="alert-msg">
-                                        <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {{ trans('general.feature_disabled') }}
+                                            </p>
+                                        @endif
+                                    </div>
+                                </div><!-- LDAP Server -->
 
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div>
+                                <!-- Start TLS -->
+                                <div class="form-group">
+                                    <div class="col-md-3">
+                                        <label for="ldap_tls">{{ trans('admin/settings/general.ldap_tls') }}</label>
+                                    </div>
+                                    <div class="col-md-8">
+                                        <label class="form-control">
+                                            <input type="checkbox" name="ldap_tls" value="1" id="ldap_tls" @checked(old('ldap_tls', $setting->ldap_tls)) />
+                                            {{ trans('admin/settings/general.ldap_tls_help') }}
+                                        </label>
+                                        @error('ldap_tls')
+                                            <span class="alert-msg">
+                                                 <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
 
-                        <!-- LDAP Phone -->
-                        <div class="form-group {{ $errors->has('ldap_phone') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <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) }}">
-                                @error('ldap_phone')
-                                    <span class="alert-msg">
-                                        <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {{ trans('general.feature_disabled') }}
+                                            </p>
+                                        @endif
+                                    </div>
+                                </div>
 
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div>
+                                <!-- Ignore LDAP Certificate -->
+                                <div class="form-group {{ $errors->has('ldap_server_cert_ignore') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <label for="ldap_server_cert_ignore">{{ trans('admin/settings/general.ldap_server_cert') }}</label>
+                                    </div>
+                                    <div class="col-md-8">
+                                        <label class="form-control">
+                                            <input type="checkbox" name="ldap_server_cert_ignore" value="1" id="ldap_server_cert_ignore" @checked(old('ldap_server_cert_ignore', $setting->ldap_server_cert_ignore)) />
+                                            {{ trans('admin/settings/general.ldap_server_cert_ignore') }}
+                                        </label>
+                                        @error('ldap_server_cert_ignore')
+                                            <span class="alert-msg">
+                                                 <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
 
-                        <!-- LDAP Job title -->
-                        <div class="form-group {{ $errors->has('ldap_jobtitle') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <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) }}">
-                                @error('ldap_jobtitle')
-                                    <span class="alert-msg">
-                                        <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
+                                        <p class="help-block">
+                                            {{ trans('admin/settings/general.ldap_server_cert_help') }}
+                                        </p>
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {{ trans('general.feature_disabled') }}
+                                            </p>
+                                        @endif
+                                    </div>
+                                </div>
 
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div>
+                                <!-- LDAP Username -->
+                                <div class="form-group {{ $errors->has('ldap_uname') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <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) }}">
+                                        @error('ldap_uname')
+                                            <span class="alert-msg">
+                                                 <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
 
-                        <!-- LDAP Country -->
-                        <div class="form-group {{ $errors->has('ldap_country') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <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) }}">
-                                @error('ldap_country')
-                                    <span class="alert-msg">
-                                        <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {{ trans('general.feature_disabled') }}
+                                            </p>
+                                        @endif
+                                    </div>
+                                </div>
 
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div>
-                        <!-- LDAP Location -->
-                        <div class="form-group {{ $errors->has('ldap_location') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <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) }}">
-                                <p class="help-block">{!! trans('admin/settings/general.ldap_location_help') !!}</p>
-                                @error('ldap_location')
-                                    <span class="alert-msg">
-                                         <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
+                                <!-- LDAP pword -->
+                                <div class="form-group {{ $errors->has('ldap_pword') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <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>
+                                        @error('ldap_pword')
+                                            <span class="alert-msg">
+                                                 <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
 
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div>
-                        @if ($setting->ldap_enabled)
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {{ trans('general.feature_disabled') }}
+                                            </p>
+                                        @endif
+                                    </div>
+                                </div>
 
-                            <!-- LDAP test -->
-                            <div class="form-group">
+                                <!-- LDAP basedn -->
+                                <div class="form-group {{ $errors->has('ldap_basedn') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <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) }}">
+                                        @error('ldap_basedn')
+                                            <span class="alert-msg">
+                                                <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
+
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {{ trans('general.feature_disabled') }}
+                                            </p>
+                                        @endif
+                                    </div>
+                                </div>
+
+                                <!-- LDAP filter -->
+                                <div class="form-group {{ $errors->has('ldap_filter') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <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=*)' }}">
+                                        @error('ldap_filter')
+                                            <span class="alert-msg">
+                                                <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
+
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {{ trans('general.feature_disabled') }}
+                                            </p>
+                                        @endif
+                                    </div>
+                                </div>
+
+                            <!-- LDAP Auth Filter Query -->
+                            <div class="form-group {{ $errors->has('ldap_auth_filter_query') ? 'error' : '' }}">
                                 <div class="col-md-3">
-                                    <label for="test_ldap_sync"> {{trans('admin/settings/general.ldap_test_label')}} </label>
+                                    <label for="ldap_auth_filter_query">{{ trans('admin/settings/general.ldap_auth_filter_query') }}</label>
                                 </div>
-                                <div class="col-md-8" id="ldaptestrow">
-                                    <a class="btn btn-default btn-sm" id="ldaptest" style="margin-right: 10px;">{{ trans('admin/settings/general.ldap_test_sync') }}</a>
-                                </div>
-                                <div class="col-md-8 col-md-offset-3">
-                                    <br />
-                                    <div id="ldapad_test_results" class="hidden well well-sm"></div>
-                                </div>
-                                <div class="col-md-8 col-md-offset-3">
-                                    <p class="help-block">{{ trans('admin/settings/general.ldap_login_sync_help') }}</p>
+                                <div class="col-md-8">
+
+                                    <input type="text" name="ldap_auth_filter_query" id="ldap_auth_filter_query" value="{{  old('ldap_auth_filter_query', $setting->ldap_auth_filter_query) }}" class="form-control" placeholder="{{ trans('general.example') .'uid='  }}">
+                                    @error('ldap_auth_filter_query')
+                                    <span class="alert-msg">
+                                                <x-icon type="x" />
+                                                {!! $message !!}
+                                            </span>
+                                    @enderror
+
                                     @if (config('app.lock_passwords')===true)
                                         <p class="text-warning">
                                             <x-icon type="locked" />
@@ -794,68 +423,543 @@
                                         </p>
                                     @endif
                                 </div>
-
                             </div>
 
-                            <!-- LDAP Login test -->
-                            <div class="form-group">
+                            <!--  Default LDAP Permissions Group Select -->
+
+                            <div class="form-group{{ $errors->has('group') ? ' has-error' : '' }}">
                                 <div class="col-md-3">
-                                    <label for="test_ldap_login"> {{trans('admin/settings/general.ldap_test_login')}} </label>
+                                    <label for="ldap_default_group">{{ trans('admin/settings/general.ldap_default_group') }}</label>
                                 </div>
+
                                 <div class="col-md-8">
-                                    <div class="row">
-                                    <div class="col-md-4">
-                                        <input type="text" name="ldaptest_user" id="ldaptest_user"  class="form-control" placeholder="{{trans('admin/settings/general.ldap_username_placeholder')}}">
-                                    </div>
-                                    <div class="col-md-4">
-                                    <input type="password" name="ldaptest_password" id="ldaptest_password" class="form-control" placeholder="{{trans('admin/settings/general.ldap_password_placeholder')}}" autocomplete="off" readonly onfocus="this.removeAttribute('readonly');">
-                                    </div>
+
+                                    @if ($groups->count())
+                                        @if ((Config::get('app.lock_passwords') || (!Auth::user()->isSuperUser())))
+                                            <ul>
+                                                @foreach ($groups as $id => $group)
+                                                    {!! '<li>'.e($group).'</li>' !!}
+                                                @endforeach
+                                            </ul>
+
+                                            <span class="help-block">{{ trans('admin/users/general.group_memberships_helpblock') }}</span>
+                                        @else
+                                            <div class="controls">
+                                                <select name="ldap_default_group" aria-label="ldap_default_group" id="ldap_default_group" class="form-control select2">
+                                                    <option value="">{{ trans('admin/settings/general.no_default_group') }}</option>
+                                                    @foreach ($groups as $id => $group)
+                                                        <option value="{{ $id }}" {{ $setting->ldap_default_group == $id ? 'selected' : '' }}>
+                                                            {{ $group }}
+                                                        </option>
+                                                    @endforeach
+                                                </select>
+
+                                                <span class="help-block">
+                                                        {{ trans('admin/settings/general.ldap_default_group_info') }}
+                                                    </span>
+                                            </div>
+                                        @endif
+                                    @else
+                                        <p>{!! trans('admin/settings/general.no_groups') !!}</p>
+                                    @endif
+
+                                </div>
+                            </div>
+
+                        </fieldset>
+
+                        <fieldset class="bottom-padded">
+                            <legend class="highlight">
+                                {{ trans('admin/settings/general.legends.test') }}
+                            </legend>
+                            @if ($setting->ldap_enabled)
+
+                                <!-- LDAP test -->
+                                <div class="form-group">
                                     <div class="col-md-3">
-                                        <a class="btn btn-default btn-sm" id="ldaptestlogin" style="margin-right: 10px;">{{ trans('admin/settings/general.ldap_test') }}</a>
+                                        <label for="test_ldap_sync"> {{trans('admin/settings/general.ldap_test_label')}} </label>
+                                    </div>
+                                    <div class="col-md-8" id="ldaptestrow">
+                                        <a class="btn btn-default btn-sm" id="ldaptest" style="margin-right: 10px;">{{ trans('admin/settings/general.ldap_test_sync') }}</a>
+                                    </div>
+                                    <div class="col-md-8 col-md-offset-3">
+                                        <br />
+                                        <div id="ldapad_test_results" class="hidden well well-sm"></div>
+                                    </div>
+                                    <div class="col-md-8 col-md-offset-3">
+                                        <p class="help-block">{{ trans('admin/settings/general.ldap_login_sync_help') }}</p>
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {{ trans('general.feature_disabled') }}
+                                            </p>
+                                        @endif
                                     </div>
 
-
-                                </div>
-                                </div>
-                                <div class="col-md-8 col-md-offset-3">
-                                    <span id="ldaptestloginicon"></span>
-                                    <span id="ldaptestloginresult"></span>
-                                    <span id="ldaptestloginstatus"></span>
-                                </div>
-                                <div class="col-md-8 col-md-offset-3">
-                                    <p class="help-block">{{ trans('admin/settings/general.ldap_login_test_help') }}</p>
                                 </div>
 
-                        </div>
+                                <!-- LDAP Login test -->
+                                <div class="form-group">
+                                    <div class="col-md-3">
+                                        <label for="test_ldap_login"> {{trans('admin/settings/general.ldap_test_login')}} </label>
+                                    </div>
+                                    <div class="col-md-8">
+                                        <div class="row">
+                                            <div class="col-md-4">
+                                                <input type="text" name="ldaptest_user" id="ldaptest_user"  class="form-control" placeholder="{{trans('admin/settings/general.ldap_username_placeholder')}}">
+                                            </div>
+                                            <div class="col-md-4">
+                                                <input type="password" name="ldaptest_password" id="ldaptest_password" class="form-control" placeholder="{{trans('admin/settings/general.ldap_password_placeholder')}}" autocomplete="off" readonly onfocus="this.removeAttribute('readonly');">
+                                            </div>
+                                            <div class="col-md-3">
+                                                <a class="btn btn-default btn-sm" id="ldaptestlogin" style="margin-right: 10px;">{{ trans('admin/settings/general.ldap_test') }}</a>
+                                            </div>
 
 
-                       @endif
+                                        </div>
+                                    </div>
+                                    <div class="col-md-8 col-md-offset-3">
+                                        <span id="ldaptestloginicon"></span>
+                                        <span id="ldaptestloginresult"></span>
+                                        <span id="ldaptestloginstatus"></span>
+                                    </div>
+                                    <div class="col-md-8 col-md-offset-3">
+                                        <p class="help-block">{{ trans('admin/settings/general.ldap_login_test_help') }}</p>
+                                    </div>
 
-                        <!-- LDAP Forgotten password -->
-                        <div class="form-group {{ $errors->has('custom_forgot_pass_url') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                <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="url" id="custom_forgot_pass_url" value="{{ old('custom_forgot_pass_url', $setting->custom_forgot_pass_url) }}">
-                                <p class="help-block">{{ trans('admin/settings/general.custom_forgot_pass_url_help') }}</p>
-                                @error('custom_forgot_pass_url')
-                                    <span class="alert-msg">
-                                        <x-icon type="x" />
-                                        {{ $message }}
-                                    </span>
-                                @enderror
-
-                                @if (config('app.lock_passwords')===true)
-                                    <p class="text-warning">
-                                        <x-icon type="locked" />
-                                        {{ trans('general.feature_disabled') }}
-                                    </p>
-                                @endif
-                            </div>
-                        </div><!-- LDAP Server -->
+                                </div>
 
 
+                            @endif
+
+
+                        </fieldset>
+                            <fieldset class="bottom-padded">
+                            <legend class="highlight">
+                                {{ trans('admin/settings/general.legends.mapping') }}
+                            </legend>
+                                <!-- LDAP  username field-->
+                                <div class="form-group {{ $errors->has('ldap_username_field') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <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' }}">
+                                        @error('ldap_username_field')
+                                            <span class="alert-msg">
+                                                <x-icon type="x" />
+                                                {!! $message !!}
+                                            </span>
+                                        @enderror
+
+                                    </div>
+                                </div>
+
+                                <!-- LDAP Last Name Field -->
+                                <div class="form-group {{ $errors->has('ldap_lname_field') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <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' }}">
+                                        @error('ldap_lname_field')
+                                            <span class="alert-msg">
+                                                <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
+
+                                    </div>
+                                </div>
+
+                                <!-- LDAP First Name field -->
+                                <div class="form-group {{ $errors->has('ldap_fname_field') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <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'  }}">
+                                        @error('ldap_fname_field')
+                                            <span class="alert-msg">
+                                                <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
+
+                                    </div>
+                                </div>
+
+                                <!-- LDAP Display Name Field -->
+                                <div class="form-group {{ $errors->has('ldap_display_name') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <label for="ldap_lname_field">{{ trans('admin/settings/general.ldap_display_name') }}</label>
+                                    </div>
+                                    <div class="col-md-8">
+                                        <input type="text" name="ldap_display_name" id="ldap_display_name" value="{{  old('ldap_display_name', $setting->ldap_display_name) }}" class="form-control" placeholder="{{  trans('general.example') .'displayName/displayname' }}">
+                                        @error('ldap_display_name')
+                                        <span class="alert-msg">
+                                                    <x-icon type="x" />
+                                                    {{ $message }}
+                                                </span>
+                                        @enderror
+
+                                    </div>
+                                </div>
+
+
+                                <!-- LDAP active flag -->
+                                <div class="form-group {{ $errors->has('ldap_active_flag') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <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">
+                                        <p class="help-block">{!! trans('admin/settings/general.ldap_activated_flag_help') !!}</p>
+
+                                        @error('ldap_active_flag')
+                                            <span class="alert-msg">
+                                                <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
+
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {{ trans('general.feature_disabled') }}
+                                            </p>
+                                        @endif
+                                    </div>
+                                </div>
+
+                                <!-- LDAP invert active flag -->
+                                <div class="form-group">
+                                    <div class="col-md-3">
+                                        <label for="ldap_invert_active_flag">
+                                            {{ trans('admin/settings/general.ldap_invert_active_flag') }}
+                                        </label>
+                                    </div>
+                                    <div class="col-md-8">
+                                        <label class="form-control">
+                                            <input type="checkbox" name="ldap_invert_active_flag" value="1" id="ldap_invert_active_flag" @checked(old('ldap_invert_active_flag', $setting->ldap_invert_active_flag)) />
+                                            {{ trans('general.yes') }}
+                                        </label>
+                                        @error('ldap_invert_active_flag')
+                                        <span class="alert-msg">
+                                                 <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
+
+                                        <p class="help-block">
+                                            {!! trans('admin/settings/general.ldap_invert_active_flag_help') !!}
+                                        </p>
+
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {!! trans('general.feature_disabled') !!}
+                                            </p>
+                                        @endif
+                                    </div>
+
+                                </div>
+
+                                <!-- LDAP emp number -->
+                                <div class="form-group {{ $errors->has('ldap_emp_num') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <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) }}">
+                                        @error('ldap_emp_num')
+                                            <span class="alert-msg">
+                                                <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
+
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {{ trans('general.feature_disabled') }}
+                                            </p>
+                                        @endif
+                                    </div>
+                                </div>
+                                <!-- LDAP department -->
+                                <div class="form-group {{ $errors->has('ldap_dept') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <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) }}">
+
+                                        @error('ldap_dept')
+                                            <span class="alert-msg">
+                                                <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
+
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {{ trans('general.feature_disabled') }}
+                                            </p>
+                                        @endif
+                                    </div>
+                                </div>
+                                <!-- LDAP Manager -->
+                                <div class="form-group {{ $errors->has('ldap_dept') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <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) }}">
+                                        @error('ldap_manager')
+                                            <span class="alert-msg">
+                                                <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
+
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {{ trans('general.feature_disabled') }}
+                                            </p>
+                                        @endif
+                                    </div>
+                                </div>
+
+                                <!-- LDAP email -->
+                                <div class="form-group {{ $errors->has('ldap_email') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <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) }}">
+                                        @error('ldap_email')
+                                            <span class="alert-msg">
+                                                <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
+
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {{ trans('general.feature_disabled') }}
+                                            </p>
+                                        @endif
+                                    </div>
+                                </div>
+
+                                <!-- LDAP Phone -->
+                                <div class="form-group {{ $errors->has('ldap_phone') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <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) }}">
+                                        @error('ldap_phone')
+                                            <span class="alert-msg">
+                                                <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
+
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {{ trans('general.feature_disabled') }}
+                                            </p>
+                                        @endif
+                                    </div>
+                                </div>
+
+                                <!-- LDAP Mobile -->
+                                <div class="form-group {{ $errors->has('ldap_mobile') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <label for="ldap_mobile">{{ trans('admin/settings/general.ldap_mobile') }}</label>
+                                    </div>
+                                    <div class="col-md-8">
+                                        <input class="form-control" placeholder="{{ trans('general.example') .'mobile' }}" name="ldap_phone" type="text" id="ldap_mobile" value="{{ old('ldap_mobile', $setting->ldap_mobile) }}">
+                                        @error('ldap_mobile')
+                                        <span class="alert-msg">
+                                                <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
+                                    </div>
+                                </div>
+
+                                <!-- LDAP Job title -->
+                                <div class="form-group {{ $errors->has('ldap_jobtitle') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <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) }}">
+                                        @error('ldap_jobtitle')
+                                            <span class="alert-msg">
+                                                <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
+
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {{ trans('general.feature_disabled') }}
+                                            </p>
+                                        @endif
+                                    </div>
+                                </div>
+
+                                <!-- LDAP address -->
+                                <div class="form-group {{ $errors->has('ldap_address') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <label for="ldap_address">{{ trans('admin/settings/general.ldap_address') }}</label>
+                                    </div>
+                                    <div class="col-md-8">
+                                        <input class="form-control" name="ldap_address" placeholder="{{ trans('general.example') .'streetAddress' }}"  type="text" id="ldap_address" value="{{ old('ldap_address', $setting->ldap_address) }}">
+                                        @error('ldap_address')
+                                        <span class="alert-msg">
+                                                <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
+                                    </div>
+                                </div>
+
+                                <!-- LDAP city -->
+                                <div class="form-group {{ $errors->has('ldap_city') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <label for="ldap_city">{{ trans('admin/settings/general.ldap_city') }}</label>
+                                    </div>
+                                    <div class="col-md-8">
+                                        <input class="form-control" placeholder="{{ trans('general.example') .'l' }}" name="ldap_city" type="text" id="ldap_city" value="{{ old('ldap_city', $setting->ldap_city) }}">
+                                        @error('ldap_city')
+                                        <span class="alert-msg">
+                                                <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
+                                    </div>
+                                </div>
+
+                                <!-- LDAP state -->
+                                <div class="form-group {{ $errors->has('ldap_state') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <label for="ldap_state">{{ trans('admin/settings/general.ldap_state') }}</label>
+                                    </div>
+                                    <div class="col-md-8">
+                                        <input class="form-control" placeholder="{{ trans('general.example') .'st' }}"  name="ldap_state" type="text" id="ldap_state" value="{{ old('ldap_state', $setting->ldap_state) }}">
+                                        @error('ldap_state')
+                                        <span class="alert-msg">
+                                                <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
+                                    </div>
+                                </div>
+
+                                <!-- LDAP zip -->
+                                <div class="form-group {{ $errors->has('ldap_zip') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <label for="ldap_zip">{{ trans('admin/settings/general.ldap_zip') }}</label>
+                                    </div>
+                                    <div class="col-md-8">
+                                        <input class="form-control" name="ldap_zip" type="text" id="ldap_zip" placeholder="{{ trans('general.example') .'postalCode' }}"  value="{{ old('ldap_zip', $setting->ldap_zip) }}">
+                                        @error('ldap_zip')
+                                        <span class="alert-msg">
+                                                <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
+                                    </div>
+                                </div>
+
+
+                                <!-- LDAP Country -->
+                                <div class="form-group {{ $errors->has('ldap_country') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <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') .'co' }}" name="ldap_country" type="text" id="ldap_country" value="{{ old('ldap_country', $setting->ldap_country) }}">
+                                        @error('ldap_country')
+                                            <span class="alert-msg">
+                                                <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
+
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {{ trans('general.feature_disabled') }}
+                                            </p>
+                                        @endif
+                                    </div>
+                                </div>
+
+                                <!-- LDAP Location -->
+                                <div class="form-group {{ $errors->has('ldap_location') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <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) }}">
+                                        <p class="help-block">{!! trans('admin/settings/general.ldap_location_help') !!}</p>
+                                        @error('ldap_location')
+                                            <span class="alert-msg">
+                                                 <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
+
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {{ trans('general.feature_disabled') }}
+                                            </p>
+                                        @endif
+                                    </div>
+                                </div>
+                        </fieldset>
+
+                        <fieldset class="bottom-padded">
+                            <legend class="highlight">
+                                {{ trans('admin/settings/general.legends.misc') }}
+                            </legend>
+                                <!-- LDAP Forgotten password -->
+                                <div class="form-group {{ $errors->has('custom_forgot_pass_url') ? 'error' : '' }}">
+                                    <div class="col-md-3">
+                                        <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="url" id="custom_forgot_pass_url" value="{{ old('custom_forgot_pass_url', $setting->custom_forgot_pass_url) }}">
+                                        <p class="help-block">{{ trans('admin/settings/general.custom_forgot_pass_url_help') }}</p>
+                                        @error('custom_forgot_pass_url')
+                                            <span class="alert-msg">
+                                                <x-icon type="x" />
+                                                {{ $message }}
+                                            </span>
+                                        @enderror
+
+                                        @if (config('app.lock_passwords')===true)
+                                            <p class="text-warning">
+                                                <x-icon type="locked" />
+                                                {{ trans('general.feature_disabled') }}
+                                            </p>
+                                        @endif
+                                    </div>
+                                </div><!-- LDAP Server -->
+
+                        </fieldset>
                     </div>
                 </div> <!--/.box-body-->
                 <div class="box-footer">
@@ -1032,6 +1136,7 @@
             var keys = [
                 '{{ trans('admin/settings/general.employee_number') }}',
                 '{{ trans('mail.username') }}',
+                '{{ trans('admin/settings/general.ldap_display_name') }}',
                 '{{ trans('general.first_name') }}',
                 '{{ trans('general.last_name') }}',
                 '{{ trans('general.email') }}'
@@ -1048,7 +1153,7 @@
         {
             let body = '<tbody>'
             for (var i in users) {
-                body += '<tr><td>' + users[i].employee_number + '</td><td>' + users[i].username + '</td><td>' + users[i].firstname + '</td><td>' + users[i].lastname + '</td><td>' + users[i].email + '</td></tr>'
+                body += '<tr><td>' + users[i].employee_number + '</td><td>' + users[i].username + '</td><td>' + users[i].display_name + '</td><td>' + users[i].firstname + '</td><td>' + users[i].lastname + '</td><td>' + users[i].email + '</td></tr>'
             }
             body += "</tbody>"
             return body;
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 3df806ff7a..c38393a246 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -311,6 +311,23 @@
 
                               <!-- everything here should be what is considered optional -->
                               <br>
+
+                              <!-- Display Name -->
+                              <div class="form-group {{ $errors->has('display_name') ? 'has-error' : '' }}">
+                                  <label class="col-md-3 control-label" for="display_name">{{ trans('admin/users/table.display_name') }}</label>
+                                  <div class="col-md-6">
+                                      <input
+                                              class="form-control"
+                                              type="text"
+                                              maxlength="191"
+                                              name="display_name"
+                                              id="display_name"
+                                              value="{{ old('display_name', $user->display_name) }}"
+                                      />
+                                      {!! $errors->first('display_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                  </div>
+                              </div>
+
                               <!-- Company -->
                               @if ((Gate::allows('canEditAuthFields', $user)) && (\App\Models\Company::canManageUsersCompanies()))
                                   @include ('partials.forms.edit.company-select', ['translated_name' => trans('general.select_company'), 'fieldname' => 'company_id'])
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index d57a216ee1..ea0017869d 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -319,34 +319,13 @@
                         {{ trans('admin/users/table.name') }}
                       </div>
                       <div class="col-md-9">
-                        {{ $user->present()->fullName() }}
+                        {{ $user->first_name }} {{ $user->last_name }}
                       </div>
 
                   </div>
 
 
 
-                   <!-- company -->
-                    @if (!is_null($user->company))
-                    <div class="row">
-
-                      <div class="col-md-3">
-                        {{ trans('general.company') }}
-                      </div>
-                      <div class="col-md-9">
-                          @can('view', 'App\Models\Company')
-                            <a href="{{ route('companies.show', $user->company->id) }}">
-                                {{ $user->company->name }}
-                            </a>
-                              @else
-                              {{ $user->company->name }}
-                            @endcan
-                      </div>
-
-                    </div>
-
-                    @endif
-
                     <!-- username -->
                     <div class="row">
 
@@ -366,6 +345,19 @@
 
                     </div>
 
+                   <!-- display name -->
+                   @if ($user->display_name)
+                   <div class="row">
+
+                       <div class="col-md-3">
+                           {{ trans('admin/users/table.display_name') }}
+                       </div>
+                       <div class="col-md-9">
+                           {{ $user->display_name }}
+                       </div>
+                   </div>
+                   @endif
+
                     <!-- address -->
                     @if (($user->address) || ($user->city) || ($user->state) || ($user->country))
                     <div class="row">
@@ -394,6 +386,26 @@
                     </div>
                     @endif
 
+                   <!-- company -->
+                   @if (!is_null($user->company))
+                       <div class="row">
+
+                           <div class="col-md-3">
+                               {{ trans('general.company') }}
+                           </div>
+                           <div class="col-md-9">
+                               @can('view', 'App\Models\Company')
+                                   <a href="{{ route('companies.show', $user->company->id) }}">
+                                       {{ $user->company->name }}
+                                   </a>
+                               @else
+                                   {{ $user->company->name }}
+                               @endcan
+                           </div>
+
+                       </div>
+
+                   @endif
 
                      <!-- groups -->
                      <div class="row">