coder
diff --git a/‎coderd/database/dbmem/dbmem.go
+1-1 b/‎coderd/database/dbmem/dbmem.go
+1-1
diff --git a/‎coderd/database/models.go
+1-1 b/‎coderd/database/models.go
+1-1
diff --git a/‎coderd/database/querier.go
+1-1 b/‎coderd/database/querier.go
+1-1
diff --git a/‎coderd/database/queries.sql.go
+1-1 b/‎coderd/database/queries.sql.go
+1-1
diff --git a/‎coderd/userauth.go
+2-1 b/‎coderd/userauth.go
+2-1
diff --git a/‎coderd/users.go
+2-1 b/‎coderd/users.go
+2-1
@@ -6928,7 +6928,7 @@ func (q *FakeQuerier) ListWorkspaceAgentPortShares(_ context.Context, workspaceI
 	return shares, nil
 }
 
-func (q *FakeQuerier) OrganizationMembers(ctx context.Context, arg database.OrganizationMembersParams) ([]database.OrganizationMembersRow, error) {
+func (q *FakeQuerier) OrganizationMembers(_ context.Context, arg database.OrganizationMembersParams) ([]database.OrganizationMembersRow, error) {
 	if err := validateDatabaseType(arg); err != nil {
 		return []database.OrganizationMembersRow{}, err
 	}
 
@@ -1519,7 +1519,8 @@ func (api *API) oauthLogin(r *http.Request, params *oauthLoginParams) ([]*http.C
 
 			//nolint:gocritic // No user present in the context.
 			memberships, err := tx.OrganizationMembers(dbauthz.AsSystemRestricted(ctx), database.OrganizationMembersParams{
-				UserID: user.ID,
+				UserID:         user.ID,
+				OrganizationID: uuid.Nil,
 			})
 			if err != nil {
 				return xerrors.Errorf("get organization memberships: %w", err)
 
@@ -1034,7 +1034,8 @@ func (api *API) userRoles(rw http.ResponseWriter, r *http.Request) {
 	}
 
 	memberships, err := api.Database.OrganizationMembers(ctx, database.OrganizationMembersParams{
-		UserID: user.ID,
+		UserID:         user.ID,
+		OrganizationID: uuid.Nil,
 	})
 	if err != nil {
 		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
Original file line number	Diff line number	Diff line change
`@@ -6928,7 +6928,7 @@ func (q *FakeQuerier) ListWorkspaceAgentPortShares(_ context.Context, workspaceI`
`6928`	`6928`	`return shares, nil`
`6929`	`6929`	`}`
`6930`	`6930`
`6931`		`-func (q *FakeQuerier) OrganizationMembers(ctx context.Context, arg database.OrganizationMembersParams) ([]database.OrganizationMembersRow, error) {`
	`6931`	`+func (q *FakeQuerier) OrganizationMembers(_ context.Context, arg database.OrganizationMembersParams) ([]database.OrganizationMembersRow, error) {`
`6932`	`6932`	`if err := validateDatabaseType(arg); err != nil {`
`6933`	`6933`	`return []database.OrganizationMembersRow{}, err`
`6934`	`6934`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1034,7 +1034,8 @@ func (api API) userRoles(rw http.ResponseWriter, r http.Request) {`
`1034`	`1034`	`}`
`1035`	`1035`
`1036`	`1036`	`memberships, err := api.Database.OrganizationMembers(ctx, database.OrganizationMembersParams{`
`1037`		`- UserID: user.ID,`
	`1037`	`+ UserID: user.ID,`
	`1038`	`+ OrganizationID: uuid.Nil,`
`1038`	`1039`	`})`
`1039`	`1040`	`if err != nil {`
`1040`	`1041`	`httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{`