diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index fb42d547e9a1..8f4760192f17 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -378,11 +378,12 @@ class UserController extends BaseController
         $new_user = $this->user_repo->save($request->all(), $user);
         $new_user = $user->fresh();
 
-
-        nlog($old_user);
-
-        if ($old_user_email != $new_email) 
+        /* When changing email address we store the former email in case we need to rollback */
+        if ($old_user_email != $new_email) {
+            $user->last_confirmed_email_address = $old_user_email;
+            $user->save();
             UserEmailChanged::dispatch($new_user, json_decode($old_user), auth()->user()->company());
+        }
         
         
         if(
diff --git a/app/Mail/Invoices/InvoiceWasPaid.php b/app/Mail/Invoices/InvoiceWasPaid.php
deleted file mode 100644
index ef61ba8b4b03..000000000000
--- a/app/Mail/Invoices/InvoiceWasPaid.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Mail\Invoices;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Mail\Mailable;
-use Illuminate\Queue\SerializesModels;
-
-class InvoiceWasPaid extends Mailable
-{
-    // use Queueable, SerializesModels;
-
-    /**
-     * Create a new message instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        //
-    }
-
-    /**
-     * Build the message.
-     *
-     * @return $this
-     */
-    public function build()
-    {
-        return $this->from(config('mail.from.address'), config('mail.from.name'))->view('email.invoices.paid');
-    }
-}
diff --git a/app/Mail/Quote/QuoteWasApproved.php b/app/Mail/Quote/QuoteWasApproved.php
deleted file mode 100644
index 22d6de965fce..000000000000
--- a/app/Mail/Quote/QuoteWasApproved.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Mail\Quote;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Mail\Mailable;
-use Illuminate\Queue\SerializesModels;
-
-class QuoteWasApproved extends Mailable
-{
-   // use Queueable, SerializesModels;
-
-    /**
-     * Create a new message instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        //
-    }
-
-    /**
-     * Build the message.
-     *
-     * @return $this
-     */
-    public function build()
-    {
-        return $this->from(config('mail.from.address'), config('mail.from.name'))->view('email.quotes.approved');
-    }
-}
diff --git a/app/Transformers/UserTransformer.php b/app/Transformers/UserTransformer.php
index c025bc83971c..dd6e2c82816e 100644
--- a/app/Transformers/UserTransformer.php
+++ b/app/Transformers/UserTransformer.php
@@ -58,6 +58,7 @@ class UserTransformer extends EntityTransformer
             'custom_value3' => $user->custom_value3 ?: '',
             'custom_value4' => $user->custom_value4 ?: '',
             'oauth_provider_id' => (string) $user->oauth_provider_id,
+            'last_confirmed_email_address' => (string) $user->last_confirmed_email_address ?: '',
         ];
     }
 
diff --git a/database/migrations/2021_02_19_212722_email_last_confirmed_email_address_users_table.php b/database/migrations/2021_02_19_212722_email_last_confirmed_email_address_users_table.php
new file mode 100644
index 000000000000..cf197f67de10
--- /dev/null
+++ b/database/migrations/2021_02_19_212722_email_last_confirmed_email_address_users_table.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class EmailLastConfirmedEmailAddressUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function(Blueprint $table){
+            $table->string('last_confirmed_email_address')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}