diff --git a/app/Models/User.php b/app/Models/User.php
index 438f432c56..22291cd9cd 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -572,7 +572,6 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
 
             if ($format=='firstname.lastname') {
                 $username = str_slug($first_name) . '.' . str_slug($last_name);
-
             } elseif ($format == 'lastnamefirstinitial') {
                 $username = str_slug($last_name.substr($first_name, 0, 1));
             } elseif ($format == 'firstintial.lastname') {
@@ -589,7 +588,9 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
                 $username = str_slug($first_name).str_slug($last_name);
             } elseif ($format == 'firstnamelastinitial') {
                 $username = str_slug(($first_name.substr($last_name, 0, 1)));
-              }
+            } elseif ($format == 'lastname.firstname') {
+                $username = str_slug($last_name).'.'.str_slug($first_name);
+            }
         }
 
         $user['first_name'] = $first_name;
diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index ec0b8e6ee3..7777302a62 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -134,6 +134,7 @@ return [
     'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
     'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
     'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+    'lastnamefirstname'      => 'Last Name First Name (smith.jane@example.com)',
     'first_name'			=> 'First Name',
     'first_name_format'		=> 'First Name (jane@example.com)',
     'files'                 => 'Files',
diff --git a/resources/macros/macros.php b/resources/macros/macros.php
index 695fa86b06..584c7df845 100644
--- a/resources/macros/macros.php
+++ b/resources/macros/macros.php
@@ -190,6 +190,7 @@ Form::macro('username_format', function ($name = 'username_format', $selected =
         'lastname_firstinitial' => trans('general.lastname_firstinitial'),
         'firstnamelastname' => trans('general.firstnamelastname'),
         'firstnamelastinitial' => trans('general.firstnamelastinitial'),
+        'lastname.firstname' => trans('general.lastnamefirstname'),
     ];
 
     $select = '<select name="'.$name.'" class="'.$class.'" style="width: 100%" aria-label="'.$name.'">';