diff --git a/pkg/auth/user.go b/pkg/auth/user.go
index a4500c140ee48d80b97000fd3f703da8be7c782d..00c817e23b3906bb1a5dd62cfac4e73a22228728 100644
--- a/pkg/auth/user.go
+++ b/pkg/auth/user.go
@@ -42,6 +42,7 @@ func (u UserPrincipal) Format(f fmt.State, verb rune) {
 func (u *UserPrincipal) Space(spaceID string) SpaceAccessor {
 	u.spaceID = spaceID
 	u.orgID = ""
+	u.hasMemberRole = false
 	return u
 }
 
@@ -55,6 +56,8 @@ func (u *UserPrincipal) getSpace(ctx context.Context, spaceID string) *spaces.Sp
 
 func (u UserPrincipal) Organization(orgID string) OrganizationAccessor {
 	u.orgID = orgID
+	u.spaceID = ""
+	u.hasMemberRole = false
 	return &u
 }