diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
index 35b538dee1b3..fee95df7257f 100644
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@@ -353,8 +353,8 @@ class ProjectController extends BaseController
         $project->fill($request->all());
         $project->save();
 
-        if (array_key_exists('documents', $data)) {
-            $this->saveDocuments($data['documents'], $project);
+        if ($request->has('documents')) {
+            $this->saveDocuments($request->input('documents'), $project);
         }
         
         return $this->itemResponse($project->fresh());
diff --git a/app/Http/Requests/Account/CreateAccountRequest.php b/app/Http/Requests/Account/CreateAccountRequest.php
index 27eea1ab3282..45cc0b250daa 100644
--- a/app/Http/Requests/Account/CreateAccountRequest.php
+++ b/app/Http/Requests/Account/CreateAccountRequest.php
@@ -38,7 +38,7 @@ class CreateAccountRequest extends Request
             'first_name'        => 'string|max:100',
             'last_name'         =>  'string:max:100',
             'password'          => 'required|string|min:6',
-            'email'             => 'bail|required|email',
+            'email'             => 'bail|required|email:rfc,dns',
             'email'             => new NewUniqueUserRule(),
             'privacy_policy'    => 'required',
             'terms_of_service'  => 'required',
diff --git a/app/Http/Requests/ClientPortal/RegisterRequest.php b/app/Http/Requests/ClientPortal/RegisterRequest.php
index 39808840aed7..06726e740d46 100644
--- a/app/Http/Requests/ClientPortal/RegisterRequest.php
+++ b/app/Http/Requests/ClientPortal/RegisterRequest.php
@@ -28,7 +28,7 @@ class RegisterRequest extends FormRequest
             'first_name' => ['required', 'string', 'max:255'],
             'last_name' => ['required', 'string', 'max:255'],
             'phone' => ['required', 'string', 'max:255'],
-            'email' => ['required', 'string', 'email', 'max:255', 'unique:client_contacts'],
+            'email' => ['required', 'string', 'email:rfc,dns', 'max:255', 'unique:client_contacts'],
             'password' => ['required', 'string', 'min:6', 'confirmed'],
         ];
     }
diff --git a/app/Http/Requests/ClientPortal/UpdateContactRequest.php b/app/Http/Requests/ClientPortal/UpdateContactRequest.php
index de9e61df9ab2..a4cdc50207de 100644
--- a/app/Http/Requests/ClientPortal/UpdateContactRequest.php
+++ b/app/Http/Requests/ClientPortal/UpdateContactRequest.php
@@ -34,7 +34,7 @@ class UpdateContactRequest extends Request
         return [
             'first_name' => 'required',
             'last_name' => 'required',
-            'email' => 'required|email|unique:client_contacts,email,'.auth()->user()->id,
+            'email' => 'required|email:rfc,dns|unique:client_contacts,email,'.auth()->user()->id,
             'password' => 'sometimes|nullable|min:6|confirmed',
         ];
     }
diff --git a/app/Http/Requests/Setup/StoreSetupRequest.php b/app/Http/Requests/Setup/StoreSetupRequest.php
index 196b71145557..a3e7d6595aa3 100644
--- a/app/Http/Requests/Setup/StoreSetupRequest.php
+++ b/app/Http/Requests/Setup/StoreSetupRequest.php
@@ -48,7 +48,7 @@ class StoreSetupRequest extends Request
           'terms_of_service'  => 'required',
           'first_name' => 'required',
           'last_name' => 'required',
-          'email' => 'required',
+          'email' => 'required|email:rfc,dns',
           'password' => 'required',
         ];
     }
diff --git a/app/Http/Requests/User/UpdateUserRequest.php b/app/Http/Requests/User/UpdateUserRequest.php
index bff4a46c0ab7..474145e11f52 100644
--- a/app/Http/Requests/User/UpdateUserRequest.php
+++ b/app/Http/Requests/User/UpdateUserRequest.php
@@ -32,7 +32,7 @@ class UpdateUserRequest extends Request
         $rules = [];
 
         if (isset($input['email'])) {
-            $rules['email'] = ['sometimes', new UniqueUserRule($this->user, $input['email'])];
+            $rules['email'] = ['email:rfc,dns', 'sometimes', new UniqueUserRule($this->user, $input['email'])];
         }
 
         return $rules;
diff --git a/app/Utils/SystemHealth.php b/app/Utils/SystemHealth.php
index 9766640c9a9e..7c02be66e752 100644
--- a/app/Utils/SystemHealth.php
+++ b/app/Utils/SystemHealth.php
@@ -35,6 +35,7 @@ class SystemHealth
         'xml',
         'bcmath',
         'mysqlnd',
+        //'intl', //todo double check whether we need this for email dns validation
     ];
 
     private static $php_version = 7.3;
diff --git a/database/migrations/2020_10_12_204517_project_number_column.php b/database/migrations/2020_10_12_204517_project_number_column.php
new file mode 100644
index 000000000000..9bf2f86cfc9f
--- /dev/null
+++ b/database/migrations/2020_10_12_204517_project_number_column.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ProjectNumberColumn extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('projects', function($table){
+            $table->string('number')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
diff --git a/database/seeders/RandomDataSeeder.php b/database/seeders/RandomDataSeeder.php
index 109a3832a77f..d2b75f333c52 100644
--- a/database/seeders/RandomDataSeeder.php
+++ b/database/seeders/RandomDataSeeder.php
@@ -100,7 +100,7 @@ class RandomDataSeeder extends Seeder
         $account->save();
 
         $user = User::factory()->create([
-            'email'             => $faker->email,
+            'email'             => $faker->freeEmail,
             'account_id' => $account->id,
             'confirmation_code' => $this->createDbHash(config('database.default')),
         ]);
diff --git a/tests/Unit/FactoryCreationTest.php b/tests/Unit/FactoryCreationTest.php
index a025cd7cb24f..1340156d0b4c 100644
--- a/tests/Unit/FactoryCreationTest.php
+++ b/tests/Unit/FactoryCreationTest.php
@@ -143,7 +143,7 @@ class FactoryCreationTest extends TestCase
     public function testUserCreate()
     {
         $new_user = UserFactory::create($this->account->id);
-        $new_user->email = $this->faker->email;
+        $new_user->email = $this->faker->freeEmail;
         $new_user->save();
 
         $this->assertNotNull($new_user);