diff --git a/app/Console/Commands/CreateSingleAccount.php b/app/Console/Commands/CreateSingleAccount.php
index 1c797b231e2f..b8d425ce8413 100644
--- a/app/Console/Commands/CreateSingleAccount.php
+++ b/app/Console/Commands/CreateSingleAccount.php
@@ -109,6 +109,14 @@ class CreateSingleAccount extends Command
             'portal_domain' => 'http://ninja.test:8000',
         ]);
 
+        $settings = $company->settings;
+        $settings->invoice_terms = 'Default company invoice terms';
+        $settings->quote_terms = 'Default company quote terms';
+        $settings->invoice_footer = 'Default invoice footer';
+
+        $company->settings = $settings;
+        $company->save();
+        
         $account->default_company_id = $company->id;
         $account->save();
 
diff --git a/app/Jobs/Account/CreateAccount.php b/app/Jobs/Account/CreateAccount.php
index 5152b42a6a88..fa867e428c59 100644
--- a/app/Jobs/Account/CreateAccount.php
+++ b/app/Jobs/Account/CreateAccount.php
@@ -25,11 +25,13 @@ use App\Jobs\Util\VersionCheck;
 use App\Mail\Admin\AccountCreatedObject;
 use App\Mail\Admin\VerifyUserObject;
 use App\Models\Account;
+use App\Models\Timezone;
 use App\Notifications\Ninja\NewAccountCreated;
 use App\Utils\Ninja;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
 use Symfony\Component\HttpFoundation\Response;
 use Turbo124\Beacon\Facades\LightLogs;
@@ -74,6 +76,7 @@ class CreateAccount
 
         $sp035a66 = CreateCompany::dispatchNow($this->request, $sp794f3f);
         $sp035a66->load('account');
+        $sp035a66->settings = $this->processSettings($sp035a66->settings);
         $sp794f3f->default_company_id = $sp035a66->id;
         $sp794f3f->save();
 
@@ -107,4 +110,53 @@ class CreateAccount
 
         return $sp794f3f;
     }
+
+    private function processSettings($settings)
+    {
+        if(Ninja::isHosted() && Cache::get('currencies') && $data = unserialize(@file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $this->request->getClientIp())))
+        {
+
+            $currency_code = strtolower($data['geoplugin_currencyCode']);
+            $country_code = strtolower($data['geoplugin_countryCode']);
+
+            $currency = Cache::get('currencies')->filter(function ($item) use ($currency_code) {
+                return strtolower($item->code) == $currency_code;
+            })->first();
+
+            if ($currency) {
+                $settings->currency_id = (string)$currency->id;
+            }
+
+            $country = Cache::get('countries')->filter(function ($item) use ($country_code) {
+                return strtolower($item->iso_3166_2) == $country_code || strtolower($item->iso_3166_3) == $country_code;
+            })->first();
+
+            if ($country) {
+                $settings->country_id = (string)$country->id;
+            }
+            
+            $language = Cache::get('languages')->filter(function ($item) use ($currency_code) {
+                return strtolower($item->locale) == $currency_code;
+            })->first();
+
+            if ($language) {
+                $settings->language_id = (string)$language->id;
+            }
+
+            $timezone = Timezone::where('name', $data['geoplugin_timezone'])->first();
+
+            if($timezone) {
+                $settings->timezone_id = (string)$timezone->id;
+            }
+
+            return $settings;
+        }
+
+
+        return $settings;
+    }
 }
+
+
+
+