diff --git a/auth-api/src/auth_api/services/org.py b/auth-api/src/auth_api/services/org.py
index 25cc82ac2..3d1af24a2 100644
--- a/auth-api/src/auth_api/services/org.py
+++ b/auth-api/src/auth_api/services/org.py
@@ -18,7 +18,7 @@
 from http import HTTPStatus
 from typing import Dict, List, Tuple
 
-from flask import current_app, g
+from flask import current_app, g, request
 from jinja2 import Environment, FileSystemLoader
 from requests.exceptions import HTTPError
 from sbc_common_components.utils.enums import QueueMessageTypes
@@ -926,7 +926,8 @@ def send_staff_review_account_reminder(relationship_id, task_relationship_type=T
             task_relationship_type=task_relationship_type, relationship_id=relationship_id
         )
         context_path = f"review-account/{task.id}"
-        app_url = f"{g.get('origin_url', '')}/"
+        app_url = request.environ.get("HTTP_ORIGIN", "localhost")
+
         review_url = f"{app_url}/{context_path}"
         first_name = user.firstname
         last_name = user.lastname
diff --git a/auth-api/tests/conftest.py b/auth-api/tests/conftest.py
index f6ad08b44..4634448c0 100644
--- a/auth-api/tests/conftest.py
+++ b/auth-api/tests/conftest.py
@@ -47,6 +47,13 @@ def app_request():
     return _app
 
 
+@pytest.fixture(scope="function", autouse=True)
+def global_http_origin(app):
+    """Set a global HTTP_ORIGIN for all tests."""
+    with app.test_request_context("/", environ_base={"HTTP_ORIGIN": "https://test.com"}):
+        yield
+
+
 @pytest.fixture(scope="session")
 def client(app):  # pylint: disable=redefined-outer-name
     """Return a session-wide Flask test client."""