diff --git a/app/Jobs/Auth/CreateUser.php b/app/Jobs/Auth/CreateUser.php
index 239d0a8f2..3b8e23935 100644
--- a/app/Jobs/Auth/CreateUser.php
+++ b/app/Jobs/Auth/CreateUser.php
@@ -44,18 +44,24 @@ class CreateUser extends Job
             $user->permissions()->attach($this->request->get('permissions'));
         }
 
-        $user->roles()->attach($this->request->get('roles'));
+        if ($this->request->has('roles')) {
+            $user->roles()->attach($this->request->get('roles'));
+        }
 
-        $user->companies()->attach($this->request->get('companies'));
+        if ($this->request->has('companies')) {
+            $user->companies()->attach($this->request->get('companies'));
+        }
 
         Artisan::call('cache:clear');
 
         // Add User Dashboard
-        foreach ($user->companies as $company) {
-            Artisan::call('user:seed', [
-                'user' => $user->id,
-                'company' => $company->id,
-            ]);
+        if (!empty($user->companies)) {
+            foreach ($user->companies as $company) {
+                Artisan::call('user:seed', [
+                    'user' => $user->id,
+                    'company' => $company->id,
+                ]);
+            }
         }
 
         Artisan::call('cache:clear');