diff --git a/models/staging/core/stg_core__user.sql b/models/staging/core/stg_core__user.sql
index c70a553..cbef85b 100644
--- a/models/staging/core/stg_core__user.sql
+++ b/models/staging/core/stg_core__user.sql
@@ -5,6 +5,9 @@ with
     stg_core__user as (
         select
             {{ adapter.quote("Id") }} as id_user,
+            {{ adapter.quote("AccountTypeId") }} as id_account_type,
+            {{ adapter.quote("CreatedUserId") }} as id_created_user,
+            {{ adapter.quote("BillingCountryId") }} as id_billing_country,
             {{ adapter.quote("Code") }} as user_code,
             {{ adapter.quote("Email") }} as email,
             {{ adapter.quote("Title") }} as title,
@@ -21,13 +24,10 @@ with
             cast({{ adapter.quote("DateOfBirth") }} as date) as date_of_birth,
             {{ adapter.quote("PhoneNumber") }} as phone_number,
             {{ adapter.quote("PasswordHash") }} as password_hash,
-            {{ adapter.quote("AccountTypeId") }} as id_account_type,
-            {{ adapter.quote("CreatedUserId") }} as id_created_user,
             {{ adapter.quote("SecurityStamp") }} as security_stamp,
             {{ adapter.quote("EmailConfirmed") }} as is_email_confirmed,
             {{ adapter.quote("LockoutEnabled") }} as is_lockout_enabled,
             {{ adapter.quote("BillingPostcode") }} as billing_postcode,
-            {{ adapter.quote("BillingCountryId") }} as id_billing_country,
             {{ adapter.quote("TwoFactorEnabled") }} as is_twofactor_enabled,
             {{ adapter.quote("AccessFailedCount") }} as access_failed_count,
             {{ adapter.quote("LockoutEndDateUtc") }} as lockout_end_date_utc,