diff --git a/virtwho/provision/virtwho_satellite.py b/virtwho/provision/virtwho_satellite.py
index 69dd3fe..3f2b9e2 100644
--- a/virtwho/provision/virtwho_satellite.py
+++ b/virtwho/provision/virtwho_satellite.py
@@ -52,7 +52,6 @@ def satellite_deploy_for_virtwho(args):
         default_org = "Default_Organization"
         satellite.sca(org=None)
     else:
-        satellite.org_create(name=default_org, label=default_org)
         satellite.sca(org=default_org)
 
     satellite_manifest_upload(
diff --git a/virtwho/register.py b/virtwho/register.py
index d65cfa0..3a891cd 100644
--- a/virtwho/register.py
+++ b/virtwho/register.py
@@ -286,7 +286,11 @@ def __init__(self, server=None, org=None, activation_key=None):
             host=self.server, user=register.ssh_username, pwd=register.ssh_password
         )
         self.hammer = "hammer --output=json"
-        self.org_id = self.organization_id()
+        try:
+            self.org_id = self.organization_id()
+        except FailException: #retry by creating org first
+            self.org_create(name=self.org, label=self.org)
+            self.org_id = self.organization_id()
         self.api = f"https://{self.server}"
         self.auth = (register.username, register.password)