diff --git a/server/forge/github/github.go b/server/forge/github/github.go
index 73c22d26b2..7e009bf8a5 100644
--- a/server/forge/github/github.go
+++ b/server/forge/github/github.go
@@ -354,20 +354,22 @@ func (c *client) Org(ctx context.Context, u *model.User, owner string) (*model.O
 	client := c.newClientToken(ctx, u.Token)
 
 	user, _, err := client.Users.Get(ctx, owner)
+	log.Trace().Msgf("Github user for owner %s = %v", owner, user)
 	if user != nil && err == nil {
 		return &model.Org{
-			Name:   user.GetName(),
+			Name:   user.GetLogin(),
 			IsUser: true,
 		}, nil
 	}
 
 	org, _, err := client.Organizations.Get(ctx, owner)
+	log.Trace().Msgf("Github organization for owner %s = %v", owner, org)
 	if err != nil {
 		return nil, err
 	}
 
 	return &model.Org{
-		Name: org.GetName(),
+		Name: org.GetLogin(),
 	}, nil
 }
 
diff --git a/server/forge/gitlab/gitlab.go b/server/forge/gitlab/gitlab.go
index 5f5ec2ab37..a90d1b1189 100644
--- a/server/forge/gitlab/gitlab.go
+++ b/server/forge/gitlab/gitlab.go
@@ -717,7 +717,7 @@ func (g *GitLab) Org(ctx context.Context, u *model.User, owner string) (*model.O
 	}
 
 	return &model.Org{
-		Name:    groups[0].Name,
+		Name:    groups[0].FullPath,
 		Private: groups[0].Visibility != gitlab.PublicVisibility,
 	}, nil
 }