diff --git a/.env.dusk.local b/.env.dusk.local
index cef7d47e8ff2..1e9637c88a31 100644
--- a/.env.dusk.local
+++ b/.env.dusk.local
@@ -16,7 +16,7 @@ DB_PASSWORD=ninja
 DB_CONNECTION=db-ninja-01
 DB_DATABASE1=db-ninja-01
 DB_DATABASE2=db-ninja-02
-MAIL_DRIVER=smtp
+MAIL_DRIVER=log
 MAIL_PORT=587
 MAIL_ENCRYPTION=tls
 MAIL_HOST=
diff --git a/app/Jobs/User/CreateUser.php b/app/Jobs/User/CreateUser.php
index ab52778bd853..d9fbb58680f5 100644
--- a/app/Jobs/User/CreateUser.php
+++ b/app/Jobs/User/CreateUser.php
@@ -50,7 +50,12 @@ class CreateUser
         $user->fill($this->request->all());
         $user->save();
 
-
+        $user->companies()->attach($this->company->id, [
+            'account_id' => $this->account->id,
+            'is_owner' => 1,
+            'is_admin' => 1,
+        ]);
+/*
         CompanyUser::create([
             'user_id' => $user->id,
             'account_id' => $this->account->id,
@@ -61,7 +66,7 @@ class CreateUser
 
         ]);
 
-
+*/
         event(new UserCreated($user));
 
         return $user;
diff --git a/tests/Integration/UniqueEmailTest.php b/tests/Integration/UniqueEmailTest.php
index 8fc6019320b9..a480e3656e2b 100644
--- a/tests/Integration/UniqueEmailTest.php
+++ b/tests/Integration/UniqueEmailTest.php
@@ -18,7 +18,6 @@ use Tests\TestCase;
 class UniqueEmailTest extends TestCase
 {
     use InteractsWithDatabase;
-    //use DatabaseMigrations;
 
     protected $rule;