diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index f2cbbcb..1c1114e 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -33,17 +33,15 @@ public function index()
             $query->where('name', 'developer');
         })->orderBy('name');
 
-        QuerySupport::queryByKeys($users, ['name', 'email']);
+        QuerySupport::queryByKeys($users, ['name', 'username']);
 
         return ApiResponse::OK->response([
-            /* 'models' => $users->paginate(config('app.pagination')), */
             'users' => $users->select([
                 'id',
                 'name',
                 'paternal',
                 'maternal',
                 'username',
-                'email',
                 'module_id',
                 'deleted_at'
             ])->paginate(config('app.pagination'))
diff --git a/app/Http/Controllers/Developer/AuthController.php b/app/Http/Controllers/Developer/AuthController.php
index dee3ce2..ae0688a 100644
--- a/app/Http/Controllers/Developer/AuthController.php
+++ b/app/Http/Controllers/Developer/AuthController.php
@@ -23,11 +23,11 @@ class AuthController extends Controller
      */
     public function login(LoginRequest $request)
     {
-        $user = User::where('email', $request->get('email'))->first();
+        $user = User::where('username', $request->get('username'))->first();
 
         if (!$user || !$user->validateForPassportPasswordGrant($request->get('password'))) {
             return ApiResponse::UNPROCESSABLE_CONTENT->response([
-                'email' => ['Usuario no valido']
+                'username' => ['Usuario no valido']
             ]);
         }
 
diff --git a/app/Http/Controllers/Repuve/DeviceController.php b/app/Http/Controllers/Repuve/DeviceController.php
index 1048e7c..f69493f 100644
--- a/app/Http/Controllers/Repuve/DeviceController.php
+++ b/app/Http/Controllers/Repuve/DeviceController.php
@@ -181,7 +181,7 @@ public function update(DeviceUpdateRequest $request, $id)
                     ->map(fn($dm) => [
                         'id' => $dm->user->id,
                         'name' => $dm->user->full_name,
-                        'email' => $dm->user->email,
+                        'username' => $dm->user->username,
                     ])
                     ->unique('id')
                     ->values(),
diff --git a/app/Http/Controllers/Repuve/ExcelController.php b/app/Http/Controllers/Repuve/ExcelController.php
index cf1da64..9d23f32 100644
--- a/app/Http/Controllers/Repuve/ExcelController.php
+++ b/app/Http/Controllers/Repuve/ExcelController.php
@@ -899,7 +899,7 @@ public function exportSearchRecords(Request $request)
             'vehicle.tag.module:id,name',
             'files:id,record_id,name_id,path,md5',
             'files.catalogName:id,name',
-            'user:id,name,email,module_id',
+            'user:id,name,username,module_id',
             'module:id,name',
             'error:id,code,description',
             'vehicle.vehicleTagLogs' => function ($q) {
diff --git a/app/Http/Controllers/Repuve/InscriptionController.php b/app/Http/Controllers/Repuve/InscriptionController.php
index 0d21e30..c60e888 100644
--- a/app/Http/Controllers/Repuve/InscriptionController.php
+++ b/app/Http/Controllers/Repuve/InscriptionController.php
@@ -322,7 +322,7 @@ public function searchRecord(Request $request)
             'files.catalogName:id,name',
 
             // Operador y módulo
-            'user:id,name,email,module_id',
+            'user:id,name,username,module_id',
             'module:id,name',
 
             // Error si existe
@@ -462,7 +462,7 @@ public function searchRecord(Request $request)
                 'operator' => $record->user ? [
                     'id' => $record->user->id,
                     'name' => $record->user->name,
-                    'email' => $record->user->email,
+                    'username' => $record->user->username,
                 ] : null,
 
                 // VEHÍCULO
diff --git a/app/Http/Controllers/Repuve/ModuleController.php b/app/Http/Controllers/Repuve/ModuleController.php
index d9aa95b..ebfecb4 100644
--- a/app/Http/Controllers/Repuve/ModuleController.php
+++ b/app/Http/Controllers/Repuve/ModuleController.php
@@ -22,9 +22,9 @@ public function index(Request $request)
     {
         try {
             $modules = Module::with([
-                'responsible:id,name,email',
+                'responsible:id,name,username',
                 'municipality:id,code,name',
-                'users:id,name,paternal,maternal,email,module_id',
+                'users:id,name,paternal,maternal,username,module_id',
                 'users.roles:id,name,description'
             ]);
 
@@ -107,9 +107,9 @@ public function show($id)
     {
         try {
         $modules = Module::with([
-            'responsible:id,name,email',
+            'responsible:id,name,username',
             'municipality:id,code,name',
-            'users:id,name,paternal,maternal,email,module_id',
+            'users:id,name,paternal,maternal,username,module_id',
             'users.roles:id,name,description'
         ])->find($id);
 
diff --git a/app/Http/Controllers/Repuve/PackageController.php b/app/Http/Controllers/Repuve/PackageController.php
index 9476303..65d1d73 100644
--- a/app/Http/Controllers/Repuve/PackageController.php
+++ b/app/Http/Controllers/Repuve/PackageController.php
@@ -31,10 +31,10 @@ public function index(Request $request)
                     'tags.status:id,code,name',
                     'tags.vehicle:id,placa,niv',
                     'tags.module:id,name',
-                    'user:id,name,email'
+                    'user:id,name,username'
                 ]);
             } else {
-                $packages->with('user:id,name,email');
+                $packages->with('user:id,name,username');
             }
 
             $packages->withCount('tags')->orderBy('id', 'ASC');
@@ -74,7 +74,7 @@ public function index(Request $request)
                         'created_by' => $package->user ? [
                             'id' => $package->user->id,
                             'name' => $package->user->name,
-                            'email' => $package->user->email,
+                            'username' => $package->user->username,
                         ] : null,
                         'estadisticas' => [
                             'total' => $package->tags->count(),
@@ -460,7 +460,7 @@ public function getBoxTags(Request $request)
                     'created_by' => $package->user ? [
                         'id' => $package->user->id,
                         'name' => $package->user->name,
-                        'email' => $package->user->email,
+                        'username' => $package->user->username,
                     ] : null,
                 ],
                 'tags' => $paginatedTags,
diff --git a/app/Http/Requests/User/UserUpdateRequest.php b/app/Http/Requests/User/UserUpdateRequest.php
index 2788cc9..e85e572 100644
--- a/app/Http/Requests/User/UserUpdateRequest.php
+++ b/app/Http/Requests/User/UserUpdateRequest.php
@@ -32,11 +32,11 @@ public function rules(): array
             'name' => ['required', 'string', 'max:255'],
             'paternal' => ['required', 'string', 'max:255'],
             'maternal' => ['required', 'string', 'max:255'],
-            'email' => [
+            'username' => [
                 'required',
                 'string',
-                'email',
                 'max:255',
+                'alpha_dash',
                 Rule::unique('users')->ignore(auth()->user()->id),
             ],
             'phone' => ['nullable', 'numeric', 'digits:10'],
diff --git a/resources/views/user/password-forgot.blade.php b/resources/views/user/password-forgot.blade.php
index 2c0ab1f..baf76ad 100644
--- a/resources/views/user/password-forgot.blade.php
+++ b/resources/views/user/password-forgot.blade.php
@@ -1,7 +1,7 @@
 <x-mail::message>
 {{ __('auth.forgot.description') }}
 
-<x-mail::button :url="config('app.frontend_url') . '/auth.html#/reset-password?token=' . $token . '&email=' . $user->email">
+<x-mail::button :url="config('app.frontend_url') . '/auth.html#/reset-password?token=' . $token . '&username=' . $user->username">
 {{ __('auth.forgot.reset') }}
 </x-mail::button>