diff --git a/app/Http/Controllers/CompanyUserController.php b/app/Http/Controllers/CompanyUserController.php
index 572e6bb541b8..fa6d5ccfb9d2 100644
--- a/app/Http/Controllers/CompanyUserController.php
+++ b/app/Http/Controllers/CompanyUserController.php
@@ -27,8 +27,6 @@ class CompanyUserController extends BaseController
     public function __construct()
     {
         parent::__construct();
-
-        //$this->middleware('guest');
     }
 
     /**
@@ -38,7 +36,6 @@ class CompanyUserController extends BaseController
      */
     public function index()
     {
-        // return view('signup.index');
     }
 
     /**
@@ -48,11 +45,10 @@ class CompanyUserController extends BaseController
      */
     public function create()
     {
-        //
     }
 
     
-    public function store(CreateAccountRequest $request)
+    public function store()
     {
     }
 
@@ -125,8 +121,8 @@ class CompanyUserController extends BaseController
      */
     public function update(UpdateCompanyUserRequest $request, User $user)
     {
-        $company = auth()->user()->company();
 
+        $company = auth()->user()->company();
             
         $company_user = CompanyUser::whereUserId($user->id)->whereCompanyId($company->id)->first();
 
@@ -145,6 +141,7 @@ class CompanyUserController extends BaseController
         $company_user->save();
 
         return $this->itemResponse($company_user->fresh());
+        
     }
 
     /**
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index f48df4bc5da3..c479b1c58ba3 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -13,6 +13,8 @@ namespace App\Http\Controllers;
 
 use App\DataMapper\CompanySettings;
 use App\DataMapper\DefaultSettings;
+use App\Events\User\UserEmailAddressChangedNewEmail;
+use App\Events\User\UserEmailAddressChangedOldEmail;
 use App\Factory\UserFactory;
 use App\Filters\UserFilters;
 use App\Http\Controllers\Traits\VerifiesUserEmail;
@@ -30,6 +32,7 @@ use App\Models\CompanyUser;
 use App\Models\User;
 use App\Repositories\UserRepository;
 use App\Transformers\UserTransformer;
+use App\Utils\Ninja;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
@@ -367,8 +370,12 @@ class UserController extends BaseController
      */
     public function update(UpdateUserRequest $request, User $user)
     {
+        event(new UserEmailAddressChangedOldEmail($user->email, auth()->user()->company(), Ninja::eventVars()));
+
         $user = $this->user_repo->save($request->all(), $user);
 
+        event(new UserEmailAddressChangedNewEmail($user->email, auth()->user()->company(), Ninja::eventVars()));
+
         return $this->itemResponse($user);
     }
 
diff --git a/app/Jobs/User/UserEmailChangedNew.php b/app/Jobs/User/UserEmailChangedNew.php
new file mode 100644
index 000000000000..dabf71e83604
--- /dev/null
+++ b/app/Jobs/User/UserEmailChangedNew.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com)
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Jobs\User;
+
+use App\Jobs\Mail\BaseMailerJob;
+use App\Models\Company;
+use Illuminate\Http\Request;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class UserEmailChangedNew extends BaseMailerJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $email;
+
+    protected $company;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+
+    public function __construct(string $email, Company $company)
+    {
+        $this->email = $email;
+        $this->company = $company;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle() 
+    {
+
+    }
+}
diff --git a/app/Jobs/User/UserEmailChangedOld.php b/app/Jobs/User/UserEmailChangedOld.php
new file mode 100644
index 000000000000..098f34e266e1
--- /dev/null
+++ b/app/Jobs/User/UserEmailChangedOld.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com)
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Jobs\User;
+
+use App\Jobs\Mail\BaseMailerJob;
+use App\Models\Company;
+use Illuminate\Http\Request;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class UserEmailChangedOld extends BaseMailerJob implements ShouldQueue
+{
+    use Dispatchable;
+
+    protected $email;
+
+    protected $company;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+
+    public function __construct(string $email, Company $company)
+    {
+        $this->email = $email;
+        $this->company = $company;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle() 
+    {
+
+    }
+}
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index d493ca9e84cf..574f94adc39d 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -241,7 +241,6 @@ class EventServiceProvider extends ServiceProvider
         QuoteWasViewed::class => [
             QuoteViewedActivity::class,
         ],
-
     ];
 
     /**