diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index e5c1349bfb1a..45fed0b12e21 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -844,9 +844,11 @@
             var client = clients[i];
             clientMap[client.public_id] = client;
             var clientName = getClientDisplayName(client);
-            if (!clientName) {
-                continue;
-            }
+            @if (! $invoice->id)
+	            if (!clientName) {
+	                continue;
+	            }
+            @endif
             for (var j=0; j<client.contacts.length; j++) {
                 var contact = client.contacts[j];
                 var contactName = getContactDisplayName(contact);
@@ -1384,6 +1386,11 @@
     }
 
 	function submitAction(value) {
+		if (!isSaveValid()) {
+            model.showClientForm();
+            return false;
+        }
+
 		$('#action').val(value);
 		$('#submitButton').click();
 	}
diff --git a/resources/views/invoices/knockout.blade.php b/resources/views/invoices/knockout.blade.php
index 45b7fbb4b988..a57cc8b882e3 100644
--- a/resources/views/invoices/knockout.blade.php
+++ b/resources/views/invoices/knockout.blade.php
@@ -670,7 +670,7 @@ function ContactModel(data) {
         var str = '';
         @if (Utils::isConfirmed())
         if (self.invitation_link()) {
-            // clicking add 'silent=true' however it's removed when copying the link
+            // clicking adds 'silent=true' however it's removed when copying the link
             str += '<a href="' + self.invitation_link() + '" onclick="window.open(\'' + self.invitation_link()
                     + '?silent=true\', \'_blank\');return false;">{{ trans('texts.view_as_recipient') }}</a>';
         }