diff --git a/src/backend/app/db/postgis_utils.py b/src/backend/app/db/postgis_utils.py
index e0649a9dd3..0f5b9a5752 100644
--- a/src/backend/app/db/postgis_utils.py
+++ b/src/backend/app/db/postgis_utils.py
@@ -19,6 +19,7 @@
 
 import json
 import logging
+import random
 from datetime import datetime, timezone
 from io import BytesIO
 from random import getrandbits
@@ -378,7 +379,7 @@ def add_required_geojson_properties(
             else:
                 # Random id
                 # NOTE 32-bit int is max supported by standard postgres Integer
-                random_id = getrandbits(30)
+                random_id = random.randint(20000, 29999)
                 feature["id"] = f"{random_id}"
                 properties["osm_id"] = random_id
 
diff --git a/src/backend/app/projects/project_routes.py b/src/backend/app/projects/project_routes.py
index 876c6b3ecf..0b8deef7b1 100644
--- a/src/backend/app/projects/project_routes.py
+++ b/src/backend/app/projects/project_routes.py
@@ -888,12 +888,12 @@ async def add_additional_entity_list(
 @router.post("/{project_id}/create-entity")
 async def add_new_entity(
     db: Annotated[Connection, Depends(db_conn)],
-    project_user_dict: Annotated[ProjectUserDict, Depends(project_manager)],
+    current_user: Annotated[ProjectUserDict, Depends(mapper)],
     geojson: Dict[str, Any],
 ):
     """Create an Entity for the project in ODK."""
     try:
-        project = project_user_dict.get("project")
+        project = current_user.get("project")
         project_odk_id = project.odkid
         project_odk_creds = project.odk_credentials