diff --git a/api/server/internal/server/accountapiimp/signup.go b/api/server/internal/server/accountapiimp/signup.go
index ce6d374..04af6fc 100644
--- a/api/server/internal/server/accountapiimp/signup.go
+++ b/api/server/internal/server/accountapiimp/signup.go
@@ -48,6 +48,11 @@ func (a *AccountAPI) createOrg(ctx context.Context, sr *srequest.Signup, permiss
 		a.logger.Warn("Failed to create organization", zap.Error(err))
 		return nil, err
 	}
+	org.OrganizationRef = org.ID
+	if err := a.odb.Unprotected().Update(ctx, org); err != nil {
+		a.logger.Warn("Failed to update organization reference", zap.Error(err))
+		return nil, err
+	}
 
 	return org, nil
 }