diff --git a/setup.php b/setup.php
index 57fb31ef..12040b49 100644
--- a/setup.php
+++ b/setup.php
@@ -472,21 +472,6 @@ if(isset($_POST['add_company_settings'])){
                     <input type="text" class="form-control" name="config_company_name" placeholder="Company Name" autofocus required>  
                   </div>
                 </div>
-
-                <div class="form-group">
-                  <label>Country</label>
-                  <div class="input-group">
-                    <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
-                    </div>
-                    <select class="form-control select2" name="country">
-                      <option value="">- Country -</option>
-                      <?php foreach($countries_array as $country_name) { ?>
-                      <option><?php echo $country_name; ?></option>
-                      <?php } ?>
-                    </select>
-                  </div>
-                </div>
                 
                 <div class="form-group">
                   <label>Address</label>
@@ -543,6 +528,21 @@ if(isset($_POST['add_company_settings'])){
                   </div>
                 </div>
 
+                <div class="form-group">
+                  <label>Country</label>
+                  <div class="input-group">
+                    <div class="input-group-prepend">
+                      <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
+                    </div>
+                    <select class="form-control select2" name="country">
+                      <option value="">- Country -</option>
+                      <?php foreach($countries_array as $country_name) { ?>
+                      <option><?php echo $country_name; ?></option>
+                      <?php } ?>
+                    </select>
+                  </div>
+                </div>
+
                 <div class="form-group mb-5">
                   <label>Website</label>
                   <div class="input-group">