diff --git a/tests/foreman/ui/test_registration.py b/tests/foreman/ui/test_registration.py
new file mode 100644
index 00000000000..beb54cfd506
--- /dev/null
+++ b/tests/foreman/ui/test_registration.py
@@ -0,0 +1,62 @@
+"""Tests for registration.
+
+:Requirement: Registration
+
+:CaseLevel: Acceptance
+
+:CaseComponent: Registration
+
+:CaseAutomation: Automated
+
+:CaseImportance: Critical
+
+:Team: Rocket
+
+:TestType: Functional
+
+:Upstream: No
+"""
+
+import pytest
+
+
+@pytest.mark.tier2
+def test_positive_org_loc_change_for_registration(
+    module_activation_key,
+    module_org,
+    module_location,
+    target_sat,
+):
+    """Changing the organization and location to check if correct org and loc is updated on the global registration page as well as in the command
+
+    :id: e83ed6bc-ceae-4021-87fe-3ecde1cbf347
+
+    :expectedresults: organization and location is updated correctly on the global registration page as well as in the command.
+
+    :CaseLevel: Component
+
+    :CaseImportance: Medium
+    """
+    new_org = target_sat.api.Organization().create()
+    new_loc = target_sat.api.Location().create()
+    target_sat.api.ActivationKey(organization=new_org).create()
+    with target_sat.ui_session() as session:
+        session.organization.select(org_name=module_org.name)
+        session.location.select(loc_name=module_location.name)
+        cmd = session.host.get_register_command()
+        expected_pairs = [
+            f'organization_id={module_org.id}',
+            f'location_id={module_location.id}',
+        ]
+        for pair in expected_pairs:
+            assert pair in cmd
+        # changing the org and loc to check if correct org and loc is updated on the registration command
+        session.organization.select(org_name=new_org.name)
+        session.location.select(loc_name=new_loc.name)
+        cmd = session.host.get_register_command()
+        expected_pairs = [
+            f'organization_id={new_org.id}',
+            f'location_id={new_loc.id}',
+        ]
+        for pair in expected_pairs:
+            assert pair in cmd