diff --git a/resources/views/invoices/knockout.blade.php b/resources/views/invoices/knockout.blade.php
index 716c654035cd..8fe4bcbcce80 100644
--- a/resources/views/invoices/knockout.blade.php
+++ b/resources/views/invoices/knockout.blade.php
@@ -98,7 +98,13 @@ function ViewModel(data) {
 
         var isValid = true;
         $('input.client-email').each(function(item, value) {
+            var $email = $(value);
             var email = $(value).val();
+            
+            // Trim whitespace
+            email = (email || '').trim();
+            $email.val(email);
+            
             if (!firstName && (!email || !isValidEmailAddress(email))) {
                 isValid = false;
             }