diff --git a/app/Models/Client.php b/app/Models/Client.php
index 8ee0915933b1..31009197ff9a 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -305,6 +305,7 @@ class Client extends EntityModel
 
         $contact->fill($data);
         $contact->is_primary = $isPrimary;
+        $contact->email = trim($contact->email);
 
         return $this->contacts()->save($contact);
     }
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 83a496bcea69..8d53512e6d96 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -1441,7 +1441,8 @@
 		var isValid = model.invoice().client().name() ? true : false;
 		for (var i=0; i<model.invoice().client().contacts().length; i++) {
 			var contact = model.invoice().client().contacts()[i];
-			if (isValidEmailAddress(contact.email()) || contact.first_name() || contact.last_name()) {
+			var email = contact.email() ? contact.email().trim() : '';
+			if (isValidEmailAddress(email) || contact.first_name() || contact.last_name()) {
 				isValid = true;
 				break;
 			}
@@ -1469,7 +1470,8 @@
             if ( ! contact.send_invoice()) {
                 continue;
             }
-			if (isValidEmailAddress(contact.email())) {
+			var email = contact.email() ? contact.email().trim() : '';
+			if (isValidEmailAddress(email)) {
 				isValid = true;
 			} else {
 				isValid = false;