diff --git a/inst/sql/sql_server/cdm_version/v531/insert_location.sql b/inst/sql/sql_server/cdm_version/v531/insert_location.sql
index e3d201d..764355a 100644
--- a/inst/sql/sql_server/cdm_version/v531/insert_location.sql
+++ b/inst/sql/sql_server/cdm_version/v531/insert_location.sql
@@ -6,12 +6,12 @@ address_1,
 address_2,
 city,
 state,
-zip,
 county,
+zip,
 location_source_value
 )
 select
-row_number() over () as location_id,
+row_number() over (order by city,state,zip) as location_id,
 locations.*
 from
 (select distinct
diff --git a/inst/sql/sql_server/cdm_version/v540/insert_location.sql b/inst/sql/sql_server/cdm_version/v540/insert_location.sql
index e3d201d..995e79a 100644
--- a/inst/sql/sql_server/cdm_version/v540/insert_location.sql
+++ b/inst/sql/sql_server/cdm_version/v540/insert_location.sql
@@ -6,8 +6,8 @@ address_1,
 address_2,
 city,
 state,
-zip,
 county,
+zip,
 location_source_value
 )
 select