diff --git a/app/Ninja/Repositories/ClientRepository.php b/app/Ninja/Repositories/ClientRepository.php
index 9df81663a5e5..46f16d0676e7 100644
--- a/app/Ninja/Repositories/ClientRepository.php
+++ b/app/Ninja/Repositories/ClientRepository.php
@@ -100,6 +100,10 @@ class ClientRepository extends BaseRepository
         $contacts = isset($data['contact']) ? [$data['contact']] : $data['contacts'];
         $contactIds = [];
 
+        usort($contacts, function ($left, $right) {
+            return $right['is_primary'] - $left['is_primary'];
+        });
+
         foreach ($contacts as $contact) {
             $contact = $client->addContact($contact, $first);
             $contactIds[] = $contact->public_id;
diff --git a/storage/templates/bold.js b/storage/templates/bold.js
old mode 100644
new mode 100755
diff --git a/storage/templates/clean.js b/storage/templates/clean.js
old mode 100644
new mode 100755
diff --git a/storage/templates/modern.js b/storage/templates/modern.js
old mode 100644
new mode 100755
diff --git a/storage/templates/plain.js b/storage/templates/plain.js
old mode 100644
new mode 100755