diff --git a/internal/api/grpc/admin/org.go b/internal/api/grpc/admin/org.go
index f22c0eee17..cb232781e5 100644
--- a/internal/api/grpc/admin/org.go
+++ b/internal/api/grpc/admin/org.go
@@ -57,7 +57,7 @@ func (s *Server) SetUpOrg(ctx context.Context, req *admin_pb.SetUpOrgRequest) (*
 	org := setUpOrgOrgToDomain(req.Org)                                                //TODO: handle domain
 	_ = org
 
-	objectDetails, err := s.command.SetUpOrg(ctx, &command.OrgSetup{
+	userID, objectDetails, err := s.command.SetUpOrg(ctx, &command.OrgSetup{
 		Name:  req.Org.Name,
 		Human: human,
 	})
@@ -66,6 +66,8 @@ func (s *Server) SetUpOrg(ctx context.Context, req *admin_pb.SetUpOrgRequest) (*
 	}
 	return &admin_pb.SetUpOrgResponse{
 		Details: object.DomainToAddDetailsPb(objectDetails),
+		OrgId:   objectDetails.ResourceOwner,
+		UserId:  userID,
 	}, nil
 }
 
diff --git a/internal/api/ui/login/register_org_handler.go b/internal/api/ui/login/register_org_handler.go
index 767d09838a..20625995dd 100644
--- a/internal/api/ui/login/register_org_handler.go
+++ b/internal/api/ui/login/register_org_handler.go
@@ -67,7 +67,7 @@ func (l *Login) handleRegisterOrgCheck(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	_ = userIDs //TODO: handle userIDs
-	_, err = l.command.SetUpOrg(ctx, data.toCommandOrg())
+	_, _, err = l.command.SetUpOrg(ctx, data.toCommandOrg())
 	if err != nil {
 		l.renderRegisterOrg(w, r, authRequest, data, err)
 		return
diff --git a/internal/command/org.go b/internal/command/org.go
index 31aa0185f8..2d1f04c5fb 100644
--- a/internal/command/org.go
+++ b/internal/command/org.go
@@ -21,15 +21,15 @@ type OrgSetup struct {
 	Human AddHuman
 }
 
-func (c *Commands) SetUpOrg(ctx context.Context, o *OrgSetup) (*domain.ObjectDetails, error) {
+func (c *Commands) SetUpOrg(ctx context.Context, o *OrgSetup) (string, *domain.ObjectDetails, error) {
 	orgID, err := id.SonyFlakeGenerator.Next()
 	if err != nil {
-		return nil, err
+		return "", nil, err
 	}
 
 	userID, err := id.SonyFlakeGenerator.Next()
 	if err != nil {
-		return nil, err
+		return "", nil, err
 	}
 
 	orgAgg := org.NewAggregate(orgID)
@@ -41,14 +41,14 @@ func (c *Commands) SetUpOrg(ctx context.Context, o *OrgSetup) (*domain.ObjectDet
 		c.AddOrgMemberCommand(orgAgg, userID, domain.RoleOrgOwner),
 	)
 	if err != nil {
-		return nil, err
+		return "", nil, err
 	}
 
 	events, err := c.eventstore.Push(ctx, cmds...)
 	if err != nil {
-		return nil, err
+		return "", nil, err
 	}
-	return &domain.ObjectDetails{
+	return userID, &domain.ObjectDetails{
 		Sequence:      events[len(events)-1].Sequence(),
 		EventDate:     events[len(events)-1].CreationDate(),
 		ResourceOwner: orgID,