diff --git a/app/Console/Commands/CreateSingleAccount.php b/app/Console/Commands/CreateSingleAccount.php
index 6f508b06e3ff..d1b03c0b227c 100644
--- a/app/Console/Commands/CreateSingleAccount.php
+++ b/app/Console/Commands/CreateSingleAccount.php
@@ -11,6 +11,7 @@
 
 namespace App\Console\Commands;
 
+use App\DataMapper\ClientRegistrationFields;
 use App\DataMapper\CompanySettings;
 use App\DataMapper\FeesAndLimits;
 use App\Events\Invoice\InvoiceWasCreated;
@@ -115,6 +116,7 @@ class CreateSingleAccount extends Command
         $settings->invoice_footer = 'Default invoice footer';
 
         $company->settings = $settings;
+        $company->client_registration_fields = ClientRegistrationFields::generate();
         $company->save();
 
         $account->default_company_id = $company->id;
diff --git a/app/Utils/TranslationHelper.php b/app/Utils/TranslationHelper.php
index f751ab1def7a..513054e2d341 100644
--- a/app/Utils/TranslationHelper.php
+++ b/app/Utils/TranslationHelper.php
@@ -31,7 +31,7 @@ class TranslationHelper
         return Cache::get('countries')->each(function ($country) {
             $country->name = ctrans('texts.country_'.$country->name);
         })->sortBy(function ($country) {
-            return $country->name;
+            return $country->iso_3166_2;
         });
     }