diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 311b35768f..133937ed75 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -517,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/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/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/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">