diff --git a/api/src/graphql/roles.sdl.ts b/api/src/graphql/roles.sdl.ts
deleted file mode 100644
index bba4595a..00000000
--- a/api/src/graphql/roles.sdl.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-export const schema = gql`
-  type Role {
-    id: Int!
-    name: String!
-    createdAt: DateTime!
-    updatedAt: DateTime!
-    users: [User]!
-  }
-
-  type Query {
-    roles: [Role!]! @requireAuth
-    role(id: Int!): Role @requireAuth
-  }
-
-  input CreateRoleInput {
-    name: String!
-  }
-
-  input UpdateRoleInput {
-    name: String
-  }
-
-  type Mutation {
-    createRole(input: CreateRoleInput!): Role! @requireAuth
-    updateRole(id: Int!, input: UpdateRoleInput!): Role! @requireAuth
-    deleteRole(id: Int!): Role! @requireAuth
-  }
-`
diff --git a/api/src/graphql/users.sdl.ts b/api/src/graphql/users.sdl.ts
index 745c2114..13b2c791 100644
--- a/api/src/graphql/users.sdl.ts
+++ b/api/src/graphql/users.sdl.ts
@@ -32,19 +32,23 @@ export const schema = gql`
     email: String!
     name: String
     agencyId: Int
-    role: String
+    organizationId: Int
+    role: RoleEnum
   }
 
   input UpdateUserInput {
     email: String
     name: String
     agencyId: Int
-    role: String
+    organizationId: Int
+    role: RoleEnum
   }
 
   type Mutation {
-    createUser(input: CreateUserInput!): User! @requireAuth
-    updateUser(id: Int!, input: UpdateUserInput!): User! @requireAuth
+    createUser(input: CreateUserInput!): User!
+      @requireAuth(roles: ["USDR_ADMIN", "ORGANIZATION_ADMIN"])
+    updateUser(id: Int!, input: UpdateUserInput!): User!
+      @requireAuth(roles: ["USDR_ADMIN", "ORGANIZATION_ADMIN"])
     deleteUser(id: Int!): User! @requireAuth
   }
 `
diff --git a/api/src/lib/constants.ts b/api/src/lib/constants.ts
new file mode 100644
index 00000000..66fc2e4d
--- /dev/null
+++ b/api/src/lib/constants.ts
@@ -0,0 +1,5 @@
+export const ROLES = {
+  ORGANIZATION_ADMIN: 'ORGANIZATION_ADMIN',
+  ORGANIZATION_STAFF: 'ORGANIZATION_STAFF',
+  USDR_ADMIN: 'USDR_ADMIN',
+}
diff --git a/api/src/services/users/users.scenarios.ts b/api/src/services/users/users.scenarios.ts
index a36be647..e19cc537 100644
--- a/api/src/services/users/users.scenarios.ts
+++ b/api/src/services/users/users.scenarios.ts
@@ -1,24 +1,41 @@
-import type { Prisma, User } from '@prisma/client'
+import type { Prisma, User, Organization, Agency } from '@prisma/client'
 
 import type { ScenarioData } from '@redwoodjs/testing/api'
 
-export const standard = defineScenario<Prisma.UserCreateArgs>({
-  user: {
+export const standard = defineScenario<
+  | Prisma.OrganizationCreateArgs
+  | Prisma.AgencyCreateArgs
+  | Prisma.UserCreateArgs
+>({
+  organization: {
     one: {
       data: {
-        email: 'String',
-        updatedAt: '2023-12-10T00:37:26.049Z',
-        organization: { create: { name: 'String' } },
+        name: 'String',
       },
     },
-    two: {
+  },
+  agency: {
+    one: (scenario) => ({
+      data: {
+        name: 'String',
+        organizationId: scenario.organization.one.id,
+        code: 'String',
+      },
+    }),
+  },
+  user: {
+    one: {
       data: {
         email: 'String',
-        updatedAt: '2023-12-10T00:37:26.049Z',
+        name: 'String',
         organization: { create: { name: 'String' } },
+        agency: { create: { name: 'String', code: 'String' } },
+        role: 'ORGANIZATION_ADMIN',
       },
     },
   },
 })
 
-export type StandardScenario = ScenarioData<User, 'user'>
+export type StandardScenario = ScenarioData<User, 'user'> &
+  ScenarioData<Organization, 'organization'> &
+  ScenarioData<Agency, 'agency'>
diff --git a/api/src/services/users/users.test.ts b/api/src/services/users/users.test.ts
index 0fafc9c0..0c7fac40 100644
--- a/api/src/services/users/users.test.ts
+++ b/api/src/services/users/users.test.ts
@@ -23,17 +23,24 @@ describe('users', () => {
   })
 
   scenario('creates a user', async (scenario: StandardScenario) => {
+    mockCurrentUser({
+      id: scenario.user.one.id,
+      organizationId: scenario.user.one.organizationId,
+      email: 'email@example.com',
+      roles: ['USDR_ADMIN'],
+    })
+
     const result = await createUser({
       input: {
-        email: 'String',
-        organizationId: scenario.user.two.organizationId,
-        updatedAt: '2023-12-10T00:37:26.029Z',
+        name: scenario.user.one.name,
+        email: scenario.user.one.email,
+        agencyId: scenario.agency.one.id,
+        role: 'ORGANIZATION_STAFF',
       },
     })
 
-    expect(result.email).toEqual('String')
-    expect(result.organizationId).toEqual(scenario.user.two.organizationId)
-    expect(result.updatedAt).toEqual(new Date('2023-12-10T00:37:26.029Z'))
+    expect(result.email).toEqual(scenario.user.one.email)
+    expect(result.organizationId).toEqual(scenario.organization.one.id)
   })
 
   scenario('updates a user', async (scenario: StandardScenario) => {
diff --git a/api/src/services/users/users.ts b/api/src/services/users/users.ts
index 7276e178..3dc3789d 100644
--- a/api/src/services/users/users.ts
+++ b/api/src/services/users/users.ts
@@ -4,6 +4,9 @@ import type {
   UserRelationResolvers,
 } from 'types/graphql'
 
+import { AuthenticationError } from '@redwoodjs/graphql-server'
+
+import { ROLES } from 'src/lib/constants'
 import { db } from 'src/lib/db'
 
 export const users: QueryResolvers['users'] = () => {
@@ -16,10 +19,55 @@ export const user: QueryResolvers['user'] = ({ id }) => {
   })
 }
 
-export const createUser: MutationResolvers['createUser'] = ({ input }) => {
-  return db.user.create({
-    data: input,
-  })
+/**
+ * Determines if the current user can create a new user with the specified role.
+ * - USDR_ADMIN can create users with any role.
+ * - ORGANIZATION_ADMIN can create users with roles ORGANIZATION_STAFF or ORGANIZATION_ADMIN.
+ * - ORGANIZATION_STAFF can't create users.
+ *
+ * @param {Object} currentUser - The current user object.
+ * @param {string} userRoleToCreate - The role of the user to be created.
+ * @returns {boolean} True if the user can create the new user, false otherwise.
+ */
+const canCreateUser = (currentUser, userRoleToCreate: string) => {
+  const { USDR_ADMIN, ORGANIZATION_ADMIN, ORGANIZATION_STAFF } = ROLES
+
+  if (currentUser.roles?.includes(USDR_ADMIN)) {
+    return true
+  }
+
+  if (currentUser.roles?.includes(ORGANIZATION_ADMIN)) {
+    return (
+      userRoleToCreate === ORGANIZATION_STAFF ||
+      userRoleToCreate === ORGANIZATION_ADMIN
+    )
+  }
+
+  return false
+}
+
+export const createUser: MutationResolvers['createUser'] = async ({
+  input,
+}) => {
+  if (!canCreateUser(context.currentUser, input.role)) {
+    throw new AuthenticationError("You don't have permission to do that.")
+  }
+
+  const { agencyId } = input
+
+  try {
+    const agency = await db.agency.findUnique({ where: { id: agencyId } })
+
+    if (!agency) {
+      throw new Error('Agency not found.')
+    }
+
+    return db.user.create({
+      data: { ...input, organizationId: agency.organizationId },
+    })
+  } catch (err) {
+    throw new Error(err)
+  }
 }
 
 export const updateUser: MutationResolvers['updateUser'] = ({ id, input }) => {
diff --git a/api/types/graphql.d.ts b/api/types/graphql.d.ts
index 1c840813..97cee366 100644
--- a/api/types/graphql.d.ts
+++ b/api/types/graphql.d.ts
@@ -115,10 +115,6 @@ export type CreateReportingPeriodInput = {
   startDate: Scalars['DateTime'];
 };
 
-export type CreateRoleInput = {
-  name: Scalars['String'];
-};
-
 export type CreateSubrecipientInput = {
   certifiedAt?: InputMaybe<Scalars['DateTime']>;
   certifiedById?: InputMaybe<Scalars['Int']>;
@@ -156,7 +152,8 @@ export type CreateUserInput = {
   agencyId?: InputMaybe<Scalars['Int']>;
   email: Scalars['String'];
   name?: InputMaybe<Scalars['String']>;
-  role?: InputMaybe<Scalars['String']>;
+  organizationId?: InputMaybe<Scalars['Int']>;
+  role?: InputMaybe<RoleEnum>;
 };
 
 export type ExpenditureCategory = {
@@ -191,7 +188,6 @@ export type Mutation = {
   createOutputTemplate: OutputTemplate;
   createProject: Project;
   createReportingPeriod: ReportingPeriod;
-  createRole: Role;
   createSubrecipient: Subrecipient;
   createUpload: Upload;
   createUploadValidation: UploadValidation;
@@ -203,7 +199,6 @@ export type Mutation = {
   deleteOutputTemplate: OutputTemplate;
   deleteProject: Project;
   deleteReportingPeriod: ReportingPeriod;
-  deleteRole: Role;
   deleteSubrecipient: Subrecipient;
   deleteUpload: Upload;
   deleteUploadValidation: UploadValidation;
@@ -215,7 +210,6 @@ export type Mutation = {
   updateOutputTemplate: OutputTemplate;
   updateProject: Project;
   updateReportingPeriod: ReportingPeriod;
-  updateRole: Role;
   updateSubrecipient: Subrecipient;
   updateUpload: Upload;
   updateUploadValidation: UploadValidation;
@@ -263,11 +257,6 @@ export type MutationcreateReportingPeriodArgs = {
 };
 
 
-export type MutationcreateRoleArgs = {
-  input: CreateRoleInput;
-};
-
-
 export type MutationcreateSubrecipientArgs = {
   input: CreateSubrecipientInput;
 };
@@ -323,11 +312,6 @@ export type MutationdeleteReportingPeriodArgs = {
 };
 
 
-export type MutationdeleteRoleArgs = {
-  id: Scalars['Int'];
-};
-
-
 export type MutationdeleteSubrecipientArgs = {
   id: Scalars['Int'];
 };
@@ -390,12 +374,6 @@ export type MutationupdateReportingPeriodArgs = {
 };
 
 
-export type MutationupdateRoleArgs = {
-  id: Scalars['Int'];
-  input: UpdateRoleInput;
-};
-
-
 export type MutationupdateSubrecipientArgs = {
   id: Scalars['Int'];
   input: UpdateSubrecipientInput;
@@ -481,8 +459,6 @@ export type Query = {
   redwood?: Maybe<Redwood>;
   reportingPeriod?: Maybe<ReportingPeriod>;
   reportingPeriods: Array<ReportingPeriod>;
-  role?: Maybe<Role>;
-  roles: Array<Role>;
   subrecipient?: Maybe<Subrecipient>;
   subrecipients: Array<Subrecipient>;
   upload?: Maybe<Upload>;
@@ -543,12 +519,6 @@ export type QueryreportingPeriodArgs = {
 };
 
 
-/** About the Redwood queries. */
-export type QueryroleArgs = {
-  id: Scalars['Int'];
-};
-
-
 /** About the Redwood queries. */
 export type QuerysubrecipientArgs = {
   id: Scalars['Int'];
@@ -615,15 +585,6 @@ export type ReportingPeriod = {
   uploads: Array<Maybe<Upload>>;
 };
 
-export type Role = {
-  __typename?: 'Role';
-  createdAt: Scalars['DateTime'];
-  id: Scalars['Int'];
-  name: Scalars['String'];
-  updatedAt: Scalars['DateTime'];
-  users: Array<Maybe<User>>;
-};
-
 export type RoleEnum =
   | 'ORGANIZATION_ADMIN'
   | 'ORGANIZATION_STAFF'
@@ -698,10 +659,6 @@ export type UpdateReportingPeriodInput = {
   startDate?: InputMaybe<Scalars['DateTime']>;
 };
 
-export type UpdateRoleInput = {
-  name?: InputMaybe<Scalars['String']>;
-};
-
 export type UpdateSubrecipientInput = {
   certifiedAt?: InputMaybe<Scalars['DateTime']>;
   certifiedById?: InputMaybe<Scalars['Int']>;
@@ -739,7 +696,8 @@ export type UpdateUserInput = {
   agencyId?: InputMaybe<Scalars['Int']>;
   email?: InputMaybe<Scalars['String']>;
   name?: InputMaybe<Scalars['String']>;
-  role?: InputMaybe<Scalars['String']>;
+  organizationId?: InputMaybe<Scalars['Int']>;
+  role?: InputMaybe<RoleEnum>;
 };
 
 export type Upload = {
@@ -879,7 +837,6 @@ export type ResolversTypes = {
   CreateOutputTemplateInput: CreateOutputTemplateInput;
   CreateProjectInput: CreateProjectInput;
   CreateReportingPeriodInput: CreateReportingPeriodInput;
-  CreateRoleInput: CreateRoleInput;
   CreateSubrecipientInput: CreateSubrecipientInput;
   CreateUploadInput: CreateUploadInput;
   CreateUploadValidationInput: CreateUploadValidationInput;
@@ -898,7 +855,6 @@ export type ResolversTypes = {
   Query: ResolverTypeWrapper<{}>;
   Redwood: ResolverTypeWrapper<Redwood>;
   ReportingPeriod: ResolverTypeWrapper<MergePrismaWithSdlTypes<PrismaReportingPeriod, MakeRelationsOptional<ReportingPeriod, AllMappedModels>, AllMappedModels>>;
-  Role: ResolverTypeWrapper<Omit<Role, 'users'> & { users: Array<Maybe<ResolversTypes['User']>> }>;
   RoleEnum: RoleEnum;
   String: ResolverTypeWrapper<Scalars['String']>;
   Subrecipient: ResolverTypeWrapper<MergePrismaWithSdlTypes<PrismaSubrecipient, MakeRelationsOptional<Subrecipient, AllMappedModels>, AllMappedModels>>;
@@ -910,7 +866,6 @@ export type ResolversTypes = {
   UpdateOutputTemplateInput: UpdateOutputTemplateInput;
   UpdateProjectInput: UpdateProjectInput;
   UpdateReportingPeriodInput: UpdateReportingPeriodInput;
-  UpdateRoleInput: UpdateRoleInput;
   UpdateSubrecipientInput: UpdateSubrecipientInput;
   UpdateUploadInput: UpdateUploadInput;
   UpdateUploadValidationInput: UpdateUploadValidationInput;
@@ -934,7 +889,6 @@ export type ResolversParentTypes = {
   CreateOutputTemplateInput: CreateOutputTemplateInput;
   CreateProjectInput: CreateProjectInput;
   CreateReportingPeriodInput: CreateReportingPeriodInput;
-  CreateRoleInput: CreateRoleInput;
   CreateSubrecipientInput: CreateSubrecipientInput;
   CreateUploadInput: CreateUploadInput;
   CreateUploadValidationInput: CreateUploadValidationInput;
@@ -953,7 +907,6 @@ export type ResolversParentTypes = {
   Query: {};
   Redwood: Redwood;
   ReportingPeriod: MergePrismaWithSdlTypes<PrismaReportingPeriod, MakeRelationsOptional<ReportingPeriod, AllMappedModels>, AllMappedModels>;
-  Role: Omit<Role, 'users'> & { users: Array<Maybe<ResolversParentTypes['User']>> };
   String: Scalars['String'];
   Subrecipient: MergePrismaWithSdlTypes<PrismaSubrecipient, MakeRelationsOptional<Subrecipient, AllMappedModels>, AllMappedModels>;
   Time: Scalars['Time'];
@@ -964,7 +917,6 @@ export type ResolversParentTypes = {
   UpdateOutputTemplateInput: UpdateOutputTemplateInput;
   UpdateProjectInput: UpdateProjectInput;
   UpdateReportingPeriodInput: UpdateReportingPeriodInput;
-  UpdateRoleInput: UpdateRoleInput;
   UpdateSubrecipientInput: UpdateSubrecipientInput;
   UpdateUploadInput: UpdateUploadInput;
   UpdateUploadValidationInput: UpdateUploadValidationInput;
@@ -1089,7 +1041,6 @@ export type MutationResolvers<ContextType = RedwoodGraphQLContext, ParentType ex
   createOutputTemplate: Resolver<ResolversTypes['OutputTemplate'], ParentType, ContextType, RequireFields<MutationcreateOutputTemplateArgs, 'input'>>;
   createProject: Resolver<ResolversTypes['Project'], ParentType, ContextType, RequireFields<MutationcreateProjectArgs, 'input'>>;
   createReportingPeriod: Resolver<ResolversTypes['ReportingPeriod'], ParentType, ContextType, RequireFields<MutationcreateReportingPeriodArgs, 'input'>>;
-  createRole: Resolver<ResolversTypes['Role'], ParentType, ContextType, RequireFields<MutationcreateRoleArgs, 'input'>>;
   createSubrecipient: Resolver<ResolversTypes['Subrecipient'], ParentType, ContextType, RequireFields<MutationcreateSubrecipientArgs, 'input'>>;
   createUpload: Resolver<ResolversTypes['Upload'], ParentType, ContextType, RequireFields<MutationcreateUploadArgs, 'input'>>;
   createUploadValidation: Resolver<ResolversTypes['UploadValidation'], ParentType, ContextType, RequireFields<MutationcreateUploadValidationArgs, 'input'>>;
@@ -1101,7 +1052,6 @@ export type MutationResolvers<ContextType = RedwoodGraphQLContext, ParentType ex
   deleteOutputTemplate: Resolver<ResolversTypes['OutputTemplate'], ParentType, ContextType, RequireFields<MutationdeleteOutputTemplateArgs, 'id'>>;
   deleteProject: Resolver<ResolversTypes['Project'], ParentType, ContextType, RequireFields<MutationdeleteProjectArgs, 'id'>>;
   deleteReportingPeriod: Resolver<ResolversTypes['ReportingPeriod'], ParentType, ContextType, RequireFields<MutationdeleteReportingPeriodArgs, 'id'>>;
-  deleteRole: Resolver<ResolversTypes['Role'], ParentType, ContextType, RequireFields<MutationdeleteRoleArgs, 'id'>>;
   deleteSubrecipient: Resolver<ResolversTypes['Subrecipient'], ParentType, ContextType, RequireFields<MutationdeleteSubrecipientArgs, 'id'>>;
   deleteUpload: Resolver<ResolversTypes['Upload'], ParentType, ContextType, RequireFields<MutationdeleteUploadArgs, 'id'>>;
   deleteUploadValidation: Resolver<ResolversTypes['UploadValidation'], ParentType, ContextType, RequireFields<MutationdeleteUploadValidationArgs, 'id'>>;
@@ -1113,7 +1063,6 @@ export type MutationResolvers<ContextType = RedwoodGraphQLContext, ParentType ex
   updateOutputTemplate: Resolver<ResolversTypes['OutputTemplate'], ParentType, ContextType, RequireFields<MutationupdateOutputTemplateArgs, 'id' | 'input'>>;
   updateProject: Resolver<ResolversTypes['Project'], ParentType, ContextType, RequireFields<MutationupdateProjectArgs, 'id' | 'input'>>;
   updateReportingPeriod: Resolver<ResolversTypes['ReportingPeriod'], ParentType, ContextType, RequireFields<MutationupdateReportingPeriodArgs, 'id' | 'input'>>;
-  updateRole: Resolver<ResolversTypes['Role'], ParentType, ContextType, RequireFields<MutationupdateRoleArgs, 'id' | 'input'>>;
   updateSubrecipient: Resolver<ResolversTypes['Subrecipient'], ParentType, ContextType, RequireFields<MutationupdateSubrecipientArgs, 'id' | 'input'>>;
   updateUpload: Resolver<ResolversTypes['Upload'], ParentType, ContextType, RequireFields<MutationupdateUploadArgs, 'id' | 'input'>>;
   updateUploadValidation: Resolver<ResolversTypes['UploadValidation'], ParentType, ContextType, RequireFields<MutationupdateUploadValidationArgs, 'id' | 'input'>>;
@@ -1129,7 +1078,6 @@ export type MutationRelationResolvers<ContextType = RedwoodGraphQLContext, Paren
   createOutputTemplate?: RequiredResolverFn<ResolversTypes['OutputTemplate'], ParentType, ContextType, RequireFields<MutationcreateOutputTemplateArgs, 'input'>>;
   createProject?: RequiredResolverFn<ResolversTypes['Project'], ParentType, ContextType, RequireFields<MutationcreateProjectArgs, 'input'>>;
   createReportingPeriod?: RequiredResolverFn<ResolversTypes['ReportingPeriod'], ParentType, ContextType, RequireFields<MutationcreateReportingPeriodArgs, 'input'>>;
-  createRole?: RequiredResolverFn<ResolversTypes['Role'], ParentType, ContextType, RequireFields<MutationcreateRoleArgs, 'input'>>;
   createSubrecipient?: RequiredResolverFn<ResolversTypes['Subrecipient'], ParentType, ContextType, RequireFields<MutationcreateSubrecipientArgs, 'input'>>;
   createUpload?: RequiredResolverFn<ResolversTypes['Upload'], ParentType, ContextType, RequireFields<MutationcreateUploadArgs, 'input'>>;
   createUploadValidation?: RequiredResolverFn<ResolversTypes['UploadValidation'], ParentType, ContextType, RequireFields<MutationcreateUploadValidationArgs, 'input'>>;
@@ -1141,7 +1089,6 @@ export type MutationRelationResolvers<ContextType = RedwoodGraphQLContext, Paren
   deleteOutputTemplate?: RequiredResolverFn<ResolversTypes['OutputTemplate'], ParentType, ContextType, RequireFields<MutationdeleteOutputTemplateArgs, 'id'>>;
   deleteProject?: RequiredResolverFn<ResolversTypes['Project'], ParentType, ContextType, RequireFields<MutationdeleteProjectArgs, 'id'>>;
   deleteReportingPeriod?: RequiredResolverFn<ResolversTypes['ReportingPeriod'], ParentType, ContextType, RequireFields<MutationdeleteReportingPeriodArgs, 'id'>>;
-  deleteRole?: RequiredResolverFn<ResolversTypes['Role'], ParentType, ContextType, RequireFields<MutationdeleteRoleArgs, 'id'>>;
   deleteSubrecipient?: RequiredResolverFn<ResolversTypes['Subrecipient'], ParentType, ContextType, RequireFields<MutationdeleteSubrecipientArgs, 'id'>>;
   deleteUpload?: RequiredResolverFn<ResolversTypes['Upload'], ParentType, ContextType, RequireFields<MutationdeleteUploadArgs, 'id'>>;
   deleteUploadValidation?: RequiredResolverFn<ResolversTypes['UploadValidation'], ParentType, ContextType, RequireFields<MutationdeleteUploadValidationArgs, 'id'>>;
@@ -1153,7 +1100,6 @@ export type MutationRelationResolvers<ContextType = RedwoodGraphQLContext, Paren
   updateOutputTemplate?: RequiredResolverFn<ResolversTypes['OutputTemplate'], ParentType, ContextType, RequireFields<MutationupdateOutputTemplateArgs, 'id' | 'input'>>;
   updateProject?: RequiredResolverFn<ResolversTypes['Project'], ParentType, ContextType, RequireFields<MutationupdateProjectArgs, 'id' | 'input'>>;
   updateReportingPeriod?: RequiredResolverFn<ResolversTypes['ReportingPeriod'], ParentType, ContextType, RequireFields<MutationupdateReportingPeriodArgs, 'id' | 'input'>>;
-  updateRole?: RequiredResolverFn<ResolversTypes['Role'], ParentType, ContextType, RequireFields<MutationupdateRoleArgs, 'id' | 'input'>>;
   updateSubrecipient?: RequiredResolverFn<ResolversTypes['Subrecipient'], ParentType, ContextType, RequireFields<MutationupdateSubrecipientArgs, 'id' | 'input'>>;
   updateUpload?: RequiredResolverFn<ResolversTypes['Upload'], ParentType, ContextType, RequireFields<MutationupdateUploadArgs, 'id' | 'input'>>;
   updateUploadValidation?: RequiredResolverFn<ResolversTypes['UploadValidation'], ParentType, ContextType, RequireFields<MutationupdateUploadValidationArgs, 'id' | 'input'>>;
@@ -1261,8 +1207,6 @@ export type QueryResolvers<ContextType = RedwoodGraphQLContext, ParentType exten
   redwood: OptArgsResolverFn<Maybe<ResolversTypes['Redwood']>, ParentType, ContextType>;
   reportingPeriod: Resolver<Maybe<ResolversTypes['ReportingPeriod']>, ParentType, ContextType, RequireFields<QueryreportingPeriodArgs, 'id'>>;
   reportingPeriods: OptArgsResolverFn<Array<ResolversTypes['ReportingPeriod']>, ParentType, ContextType>;
-  role: Resolver<Maybe<ResolversTypes['Role']>, ParentType, ContextType, RequireFields<QueryroleArgs, 'id'>>;
-  roles: OptArgsResolverFn<Array<ResolversTypes['Role']>, ParentType, ContextType>;
   subrecipient: Resolver<Maybe<ResolversTypes['Subrecipient']>, ParentType, ContextType, RequireFields<QuerysubrecipientArgs, 'id'>>;
   subrecipients: OptArgsResolverFn<Array<ResolversTypes['Subrecipient']>, ParentType, ContextType>;
   upload: Resolver<Maybe<ResolversTypes['Upload']>, ParentType, ContextType, RequireFields<QueryuploadArgs, 'id'>>;
@@ -1291,8 +1235,6 @@ export type QueryRelationResolvers<ContextType = RedwoodGraphQLContext, ParentTy
   redwood?: RequiredResolverFn<Maybe<ResolversTypes['Redwood']>, ParentType, ContextType>;
   reportingPeriod?: RequiredResolverFn<Maybe<ResolversTypes['ReportingPeriod']>, ParentType, ContextType, RequireFields<QueryreportingPeriodArgs, 'id'>>;
   reportingPeriods?: RequiredResolverFn<Array<ResolversTypes['ReportingPeriod']>, ParentType, ContextType>;
-  role?: RequiredResolverFn<Maybe<ResolversTypes['Role']>, ParentType, ContextType, RequireFields<QueryroleArgs, 'id'>>;
-  roles?: RequiredResolverFn<Array<ResolversTypes['Role']>, ParentType, ContextType>;
   subrecipient?: RequiredResolverFn<Maybe<ResolversTypes['Subrecipient']>, ParentType, ContextType, RequireFields<QuerysubrecipientArgs, 'id'>>;
   subrecipients?: RequiredResolverFn<Array<ResolversTypes['Subrecipient']>, ParentType, ContextType>;
   upload?: RequiredResolverFn<Maybe<ResolversTypes['Upload']>, ParentType, ContextType, RequireFields<QueryuploadArgs, 'id'>>;
@@ -1362,24 +1304,6 @@ export type ReportingPeriodRelationResolvers<ContextType = RedwoodGraphQLContext
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
-export type RoleResolvers<ContextType = RedwoodGraphQLContext, ParentType extends ResolversParentTypes['Role'] = ResolversParentTypes['Role']> = {
-  createdAt: OptArgsResolverFn<ResolversTypes['DateTime'], ParentType, ContextType>;
-  id: OptArgsResolverFn<ResolversTypes['Int'], ParentType, ContextType>;
-  name: OptArgsResolverFn<ResolversTypes['String'], ParentType, ContextType>;
-  updatedAt: OptArgsResolverFn<ResolversTypes['DateTime'], ParentType, ContextType>;
-  users: OptArgsResolverFn<Array<Maybe<ResolversTypes['User']>>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
-};
-
-export type RoleRelationResolvers<ContextType = RedwoodGraphQLContext, ParentType extends ResolversParentTypes['Role'] = ResolversParentTypes['Role']> = {
-  createdAt?: RequiredResolverFn<ResolversTypes['DateTime'], ParentType, ContextType>;
-  id?: RequiredResolverFn<ResolversTypes['Int'], ParentType, ContextType>;
-  name?: RequiredResolverFn<ResolversTypes['String'], ParentType, ContextType>;
-  updatedAt?: RequiredResolverFn<ResolversTypes['DateTime'], ParentType, ContextType>;
-  users?: RequiredResolverFn<Array<Maybe<ResolversTypes['User']>>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
-};
-
 export type SubrecipientResolvers<ContextType = RedwoodGraphQLContext, ParentType extends ResolversParentTypes['Subrecipient'] = ResolversParentTypes['Subrecipient']> = {
   certifiedAt: OptArgsResolverFn<Maybe<ResolversTypes['DateTime']>, ParentType, ContextType>;
   certifiedBy: OptArgsResolverFn<Maybe<ResolversTypes['User']>, ParentType, ContextType>;
@@ -1561,7 +1485,6 @@ export type Resolvers<ContextType = RedwoodGraphQLContext> = {
   Query: QueryResolvers<ContextType>;
   Redwood: RedwoodResolvers<ContextType>;
   ReportingPeriod: ReportingPeriodResolvers<ContextType>;
-  Role: RoleResolvers<ContextType>;
   Subrecipient: SubrecipientResolvers<ContextType>;
   Time: GraphQLScalarType;
   Upload: UploadResolvers<ContextType>;
diff --git a/web/src/Routes.tsx b/web/src/Routes.tsx
index c9d803f9..e748d4d9 100644
--- a/web/src/Routes.tsx
+++ b/web/src/Routes.tsx
@@ -28,10 +28,12 @@ const Routes = () => {
         <Route path="/agencies/new" page={AgencyNewAgencyPage} name="newAgency" />
         <Route path="/agencies" page={AgencyAgenciesPage} name="agencies" />
         {/* Users */}
-        <Route path="/users/new" page={UserNewUserPage} name="newUser" />
-        <Route path="/users/{id:Int}/edit" page={UserEditUserPage} name="editUser" />
-        <Route path="/users/{id:Int}" page={UserUserPage} name="user" />
-        <Route path="/users" page={UserUsersPage} name="users" />
+        <PrivateSet unauthenticated="forbidden" roles={['USDR_ADMIN', 'ORGANIZATION_ADMIN']}>
+          <Route path="/users/new" page={UserNewUserPage} name="newUser" />
+          <Route path="/users/{id:Int}/edit" page={UserEditUserPage} name="editUser" />
+          <Route path="/users/{id:Int}" page={UserUserPage} name="user" />
+          <Route path="/users" page={UserUsersPage} name="users" />
+        </PrivateSet>
         {/* Reporting Periods */}
         <Route path="/reporting-periods/new" page={ReportingPeriodNewReportingPeriodPage} name="newReportingPeriod" />
         <Route path="/reporting-periods/{id:Int}/edit" page={ReportingPeriodEditReportingPeriodPage} name="editReportingPeriod" />
diff --git a/web/src/components/Navigation/Navigation.tsx b/web/src/components/Navigation/Navigation.tsx
index 4d232d49..ec337921 100644
--- a/web/src/components/Navigation/Navigation.tsx
+++ b/web/src/components/Navigation/Navigation.tsx
@@ -1,10 +1,13 @@
+import { ROLES } from 'api/src/lib/constants'
 import Nav from 'react-bootstrap/Nav'
 import { useAuth } from 'web/src/auth'
 
 import { NavLink, routes } from '@redwoodjs/router'
 
 const Navigation = () => {
-  const { currentUser } = useAuth()
+  const { hasRole } = useAuth()
+  const canViewUsersTab =
+    hasRole(ROLES.USDR_ADMIN) || hasRole(ROLES.ORGANIZATION_ADMIN)
 
   return (
     <div className="tabs-wrapper row">
@@ -40,15 +43,17 @@ const Navigation = () => {
             Subrecipients
           </NavLink>
         </Nav.Item> */}
-        <Nav.Item>
-          <NavLink
-            to={routes.users()}
-            activeClassName="active"
-            className="nav-link"
-          >
-            Users
-          </NavLink>
-        </Nav.Item>
+        {canViewUsersTab && (
+          <Nav.Item>
+            <NavLink
+              to={routes.users()}
+              activeClassName="active"
+              className="nav-link"
+            >
+              Users
+            </NavLink>
+          </Nav.Item>
+        )}
         <Nav.Item>
           <NavLink
             to={routes.reportingPeriods()}
@@ -58,7 +63,7 @@ const Navigation = () => {
             Reporting Periods
           </NavLink>
         </Nav.Item>
-        {currentUser?.roles?.includes('USDR_ADMIN') && (
+        {hasRole(ROLES.USDR_ADMIN) && (
           <Nav.Item>
             <NavLink
               to={routes.organizations()}
diff --git a/web/src/components/User/EditUserCell/EditUserCell.tsx b/web/src/components/User/EditUserCell/EditUserCell.tsx
index 07d760af..c90761ac 100644
--- a/web/src/components/User/EditUserCell/EditUserCell.tsx
+++ b/web/src/components/User/EditUserCell/EditUserCell.tsx
@@ -58,13 +58,11 @@ export const Success = ({ user }: CellSuccessProps<EditUserById>) => {
   }
 
   return (
-    <div className="rw-segment">
-      <header className="rw-segment-header">
-        <h2 className="rw-heading rw-heading-secondary">
-          Edit User {user?.id}
-        </h2>
+    <div>
+      <header>
+        <h2>Edit User {user?.id}</h2>
       </header>
-      <div className="rw-segment-main">
+      <div>
         <UserForm user={user} onSave={onSave} error={error} loading={loading} />
       </div>
     </div>
diff --git a/web/src/components/User/NewUser/NewUser.tsx b/web/src/components/User/NewUser/NewUser.tsx
index 150bea77..96dd1c8a 100644
--- a/web/src/components/User/NewUser/NewUser.tsx
+++ b/web/src/components/User/NewUser/NewUser.tsx
@@ -30,11 +30,11 @@ const NewUser = () => {
   }
 
   return (
-    <div className="rw-segment">
-      <header className="rw-segment-header">
-        <h2 className="rw-heading rw-heading-secondary">New User</h2>
+    <div>
+      <header>
+        <h2>New User</h2>
       </header>
-      <div className="rw-segment-main">
+      <div>
         <UserForm onSave={onSave} loading={loading} error={error} />
       </div>
     </div>
diff --git a/web/src/components/User/UserForm/UserForm.tsx b/web/src/components/User/UserForm/UserForm.tsx
index 0d74089e..7edb4eb1 100644
--- a/web/src/components/User/UserForm/UserForm.tsx
+++ b/web/src/components/User/UserForm/UserForm.tsx
@@ -1,18 +1,20 @@
+import { ROLES } from 'api/src/lib/constants'
 import { Button } from 'react-bootstrap'
 import { useForm, UseFormReturn } from 'react-hook-form'
 import type { EditUserById, UpdateUserInput } from 'types/graphql'
+import { useAuth } from 'web/src/auth'
 
+import type { RWGqlError } from '@redwoodjs/forms'
 import {
   Form,
   FormError,
   FieldError,
   Label,
   TextField,
-  NumberField,
   SelectField,
   Submit,
 } from '@redwoodjs/forms'
-import type { RWGqlError } from '@redwoodjs/forms'
+import { useQuery } from '@redwoodjs/web'
 
 type FormUser = NonNullable<EditUserById['user']>
 
@@ -23,20 +25,44 @@ interface UserFormProps {
   loading: boolean
 }
 
+const GET_AGENCIES_UNDER_USER_ORGANIZATION = gql`
+  query agenciesUnderUserOrganization($organizationId: Int!) {
+    agenciesByOrganization(organizationId: $organizationId) {
+      id
+      name
+    }
+  }
+`
+
 const UserForm = (props: UserFormProps) => {
+  const { hasRole, currentUser } = useAuth()
+
   const { user, onSave, error, loading } = props
   const formMethods: UseFormReturn<FormUser> = useForm<FormUser>()
   const hasErrors = Object.keys(formMethods.formState.errors).length > 0
 
+  const {
+    loading: agenciesLoading,
+    error: agenciesError,
+    data: agenciesData,
+  } = useQuery(GET_AGENCIES_UNDER_USER_ORGANIZATION, {
+    variables: { organizationId: currentUser.organizationId },
+  })
+  const agencies = agenciesData?.agenciesByOrganization
+
   // Resets the form to the previous values when editing the existing user
   // Clears out the form when creating a new user
   const onReset = () => {
     formMethods.reset()
   }
+
   const onSubmit = (data: FormUser) => {
     onSave(data, props?.user?.id)
   }
 
+  if (agenciesLoading) return <div>Loading...</div>
+  if (agenciesError) return <div>Couldn&apos;t load agencies</div>
+
   return (
     <Form<FormUser>
       onSubmit={onSubmit}
@@ -44,6 +70,12 @@ const UserForm = (props: UserFormProps) => {
       error={error}
       className={hasErrors ? 'was-validated' : ''}
     >
+      <FormError
+        error={error}
+        wrapperClassName="rw-form-error-wrapper"
+        titleClassName="rw-form-error-title"
+        listClassName="rw-form-error-list"
+      />
       {user && (
         <div className="row">
           <Label
@@ -79,13 +111,6 @@ const UserForm = (props: UserFormProps) => {
         </div>
       )}
 
-      <FormError
-        error={error}
-        wrapperClassName="rw-form-error-wrapper"
-        titleClassName="rw-form-error-title"
-        listClassName="rw-form-error-list"
-      />
-
       <div className="row mb-3">
         <Label name="email" className="form-label col-sm-2 col-form-label">
           Email
@@ -134,8 +159,14 @@ const UserForm = (props: UserFormProps) => {
         </Label>
 
         <div className="col-sm-6">
-          <SelectField name="role" className="form-select">
-            <option value="USDR_ADMIN">USDR admin</option>
+          <SelectField
+            name="role"
+            defaultValue={user?.role}
+            className="form-select"
+          >
+            {hasRole(ROLES.USDR_ADMIN) && (
+              <option value="USDR_ADMIN">USDR admin</option>
+            )}
             <option value="ORGANIZATION_ADMIN">Organization admin</option>
             <option value="ORGANIZATION_STAFF">Organization staff</option>
           </SelectField>
@@ -149,18 +180,30 @@ const UserForm = (props: UserFormProps) => {
 
       <div className="row mb-3">
         <Label name="agencyId" className="form-label col-sm-2 col-form-label">
-          Agency id
+          Agency
         </Label>
 
         <div className="col-sm-6">
-          <NumberField
+          <SelectField
             name="agencyId"
-            defaultValue={props.user?.agencyId}
-            className="form-control"
-            errorClassName="form-control is-invalid"
-            emptyAs={'undefined'}
-            validation={{ required: 'This field is required' }}
-          />
+            className="form-select"
+            validation={{
+              required: 'This field is required',
+              valueAsNumber: true,
+            }}
+            emptyAs={null}
+            defaultValue={user?.agencyId}
+            errorClassName="form-select is-invalid"
+          >
+            <option value="" hidden>
+              Select an agency
+            </option>
+            {agencies?.map((agency) => (
+              <option key={agency.id} value={parseInt(agency.id)}>
+                {agency.name}
+              </option>
+            ))}
+          </SelectField>
         </div>
 
         <FieldError
diff --git a/web/src/components/User/Users/Users.tsx b/web/src/components/User/Users/Users.tsx
index b059857c..10a0252a 100644
--- a/web/src/components/User/Users/Users.tsx
+++ b/web/src/components/User/Users/Users.tsx
@@ -8,41 +8,34 @@ import { timeTag, truncate, formatEnum } from 'src/lib/formatters'
 
 const UsersList = ({ usersByOrganization }: FindUsersByOrganizationId) => {
   return (
-    <Table striped borderless>
+    <Table striped bordered>
       <thead>
         <tr>
-          <th className="border">Email</th>
-          <th className="border">Name</th>
-          <th className="border">Agency id</th>
-          <th className="border">Role</th>
-          <th className="border">Created at</th>
-          <th className="border">Actions</th>
+          <th>Email</th>
+          <th>Name</th>
+          <th>Role</th>
+          <th>Agency</th>
+          <th>Created at</th>
+          <th>Actions</th>
         </tr>
       </thead>
       <tbody>
         {usersByOrganization.map((user) => (
           <tr key={user.id}>
-            <td className="border border-slate-700">{truncate(user.email)}</td>
-            <td className="border border-slate-700">{truncate(user.name)}</td>
-            <td className="border border-slate-700">
-              {truncate(user.agencyId)}
-            </td>
-            <td className="border border-slate-700">{formatEnum(user.role)}</td>
-            <td className="border border-slate-700">
-              {timeTag(user.createdAt)}
-            </td>
-            <td className="border border-slate-700">
-              <nav className="rw-table-actions">
-                <Link
-                  to={routes.editUser({ id: user.id })}
-                  title={'Edit user ' + user.id}
-                  className="rw-button rw-button-small rw-button-blue"
-                >
-                  <Button size="sm" variant="secondary">
-                    Edit
-                  </Button>
-                </Link>
-              </nav>
+            <td>{truncate(user.email)}</td>
+            <td>{truncate(user.name)}</td>
+            <td>{formatEnum(user.role)}</td>
+            <td>{truncate(user.agency?.name)}</td>
+            <td>{timeTag(user.createdAt)}</td>
+            <td>
+              <Link
+                to={routes.editUser({ id: user.id })}
+                title={'Edit user ' + user.id}
+              >
+                <Button size="sm" variant="secondary">
+                  Edit
+                </Button>
+              </Link>
             </td>
           </tr>
         ))}
diff --git a/web/src/components/User/UsersCell/UsersCell.tsx b/web/src/components/User/UsersCell/UsersCell.tsx
index bc13cf0c..56350fa4 100644
--- a/web/src/components/User/UsersCell/UsersCell.tsx
+++ b/web/src/components/User/UsersCell/UsersCell.tsx
@@ -11,7 +11,9 @@ export const QUERY = gql`
       id
       email
       name
-      agencyId
+      agency {
+        name
+      }
       organizationId
       role
       createdAt
diff --git a/web/src/layouts/AuthenticatedLayout/AuthenticatedLayout.tsx b/web/src/layouts/AuthenticatedLayout/AuthenticatedLayout.tsx
index 6c954bcb..fe63702d 100644
--- a/web/src/layouts/AuthenticatedLayout/AuthenticatedLayout.tsx
+++ b/web/src/layouts/AuthenticatedLayout/AuthenticatedLayout.tsx
@@ -23,7 +23,7 @@ const AuthenticatedLayout = ({ children }: AuthenticatedLayoutProps) => {
         <div className="col d-flex justify-content-end">
           {isAuthenticated && (
             <>
-              <div className="navbar-text">{currentUser.email}</div>
+              <div className="navbar-text">{currentUser?.email as string}</div>
               <Button
                 size="sm"
                 variant="link"
diff --git a/web/src/pages/User/UsersPage/UsersPage.tsx b/web/src/pages/User/UsersPage/UsersPage.tsx
index cb573ef1..16219cc2 100644
--- a/web/src/pages/User/UsersPage/UsersPage.tsx
+++ b/web/src/pages/User/UsersPage/UsersPage.tsx
@@ -1,12 +1,13 @@
 import Button from 'react-bootstrap/Button'
+import { useAuth } from 'web/src/auth'
 
 import { Link, routes } from '@redwoodjs/router'
 
 import UsersCell from 'src/components/User/UsersCell'
 
 const UsersPage = () => {
-  // temporarily hardcode organizationId to 1
-  const organizationIdOfUser = 1
+  const { currentUser } = useAuth()
+  const organizationIdOfUser = currentUser.organizationId
 
   return (
     <div>
diff --git a/web/types/graphql.d.ts b/web/types/graphql.d.ts
index 8427268c..4f2bc99d 100644
--- a/web/types/graphql.d.ts
+++ b/web/types/graphql.d.ts
@@ -96,10 +96,6 @@ export type CreateReportingPeriodInput = {
   startDate: Scalars['DateTime'];
 };
 
-export type CreateRoleInput = {
-  name: Scalars['String'];
-};
-
 export type CreateSubrecipientInput = {
   certifiedAt?: InputMaybe<Scalars['DateTime']>;
   certifiedById?: InputMaybe<Scalars['Int']>;
@@ -112,7 +108,7 @@ export type CreateSubrecipientInput = {
 
 export type CreateUploadInput = {
   agencyId: Scalars['Int'];
-  expenditureCategoryId: Scalars['Int'];
+  expenditureCategoryId?: InputMaybe<Scalars['Int']>;
   filename: Scalars['String'];
   notes?: InputMaybe<Scalars['String']>;
   organizationId: Scalars['Int'];
@@ -137,7 +133,8 @@ export type CreateUserInput = {
   agencyId?: InputMaybe<Scalars['Int']>;
   email: Scalars['String'];
   name?: InputMaybe<Scalars['String']>;
-  role?: InputMaybe<Scalars['String']>;
+  organizationId?: InputMaybe<Scalars['Int']>;
+  role?: InputMaybe<RoleEnum>;
 };
 
 export type ExpenditureCategory = {
@@ -172,7 +169,6 @@ export type Mutation = {
   createOutputTemplate: OutputTemplate;
   createProject: Project;
   createReportingPeriod: ReportingPeriod;
-  createRole: Role;
   createSubrecipient: Subrecipient;
   createUpload: Upload;
   createUploadValidation: UploadValidation;
@@ -184,7 +180,6 @@ export type Mutation = {
   deleteOutputTemplate: OutputTemplate;
   deleteProject: Project;
   deleteReportingPeriod: ReportingPeriod;
-  deleteRole: Role;
   deleteSubrecipient: Subrecipient;
   deleteUpload: Upload;
   deleteUploadValidation: UploadValidation;
@@ -196,7 +191,6 @@ export type Mutation = {
   updateOutputTemplate: OutputTemplate;
   updateProject: Project;
   updateReportingPeriod: ReportingPeriod;
-  updateRole: Role;
   updateSubrecipient: Subrecipient;
   updateUpload: Upload;
   updateUploadValidation: UploadValidation;
@@ -244,11 +238,6 @@ export type MutationcreateReportingPeriodArgs = {
 };
 
 
-export type MutationcreateRoleArgs = {
-  input: CreateRoleInput;
-};
-
-
 export type MutationcreateSubrecipientArgs = {
   input: CreateSubrecipientInput;
 };
@@ -304,11 +293,6 @@ export type MutationdeleteReportingPeriodArgs = {
 };
 
 
-export type MutationdeleteRoleArgs = {
-  id: Scalars['Int'];
-};
-
-
 export type MutationdeleteSubrecipientArgs = {
   id: Scalars['Int'];
 };
@@ -371,12 +355,6 @@ export type MutationupdateReportingPeriodArgs = {
 };
 
 
-export type MutationupdateRoleArgs = {
-  id: Scalars['Int'];
-  input: UpdateRoleInput;
-};
-
-
 export type MutationupdateSubrecipientArgs = {
   id: Scalars['Int'];
   input: UpdateSubrecipientInput;
@@ -462,8 +440,6 @@ export type Query = {
   redwood?: Maybe<Redwood>;
   reportingPeriod?: Maybe<ReportingPeriod>;
   reportingPeriods: Array<ReportingPeriod>;
-  role?: Maybe<Role>;
-  roles: Array<Role>;
   subrecipient?: Maybe<Subrecipient>;
   subrecipients: Array<Subrecipient>;
   upload?: Maybe<Upload>;
@@ -524,12 +500,6 @@ export type QueryreportingPeriodArgs = {
 };
 
 
-/** About the Redwood queries. */
-export type QueryroleArgs = {
-  id: Scalars['Int'];
-};
-
-
 /** About the Redwood queries. */
 export type QuerysubrecipientArgs = {
   id: Scalars['Int'];
@@ -596,15 +566,6 @@ export type ReportingPeriod = {
   uploads: Array<Maybe<Upload>>;
 };
 
-export type Role = {
-  __typename?: 'Role';
-  createdAt: Scalars['DateTime'];
-  id: Scalars['Int'];
-  name: Scalars['String'];
-  updatedAt: Scalars['DateTime'];
-  users: Array<Maybe<User>>;
-};
-
 export type RoleEnum =
   | 'ORGANIZATION_ADMIN'
   | 'ORGANIZATION_STAFF'
@@ -679,10 +640,6 @@ export type UpdateReportingPeriodInput = {
   startDate?: InputMaybe<Scalars['DateTime']>;
 };
 
-export type UpdateRoleInput = {
-  name?: InputMaybe<Scalars['String']>;
-};
-
 export type UpdateSubrecipientInput = {
   certifiedAt?: InputMaybe<Scalars['DateTime']>;
   certifiedById?: InputMaybe<Scalars['Int']>;
@@ -720,7 +677,8 @@ export type UpdateUserInput = {
   agencyId?: InputMaybe<Scalars['Int']>;
   email?: InputMaybe<Scalars['String']>;
   name?: InputMaybe<Scalars['String']>;
-  role?: InputMaybe<Scalars['String']>;
+  organizationId?: InputMaybe<Scalars['Int']>;
+  role?: InputMaybe<RoleEnum>;
 };
 
 export type Upload = {
@@ -728,8 +686,8 @@ export type Upload = {
   agency: Agency;
   agencyId: Scalars['Int'];
   createdAt: Scalars['DateTime'];
-  expenditureCategory: ExpenditureCategory;
-  expenditureCategoryId: Scalars['Int'];
+  expenditureCategory?: Maybe<ExpenditureCategory>;
+  expenditureCategoryId?: Maybe<Scalars['Int']>;
   filename: Scalars['String'];
   id: Scalars['Int'];
   notes?: Maybe<Scalars['String']>;
@@ -738,6 +696,7 @@ export type Upload = {
   reportingPeriod: ReportingPeriod;
   reportingPeriodId: Scalars['Int'];
   signedUrl?: Maybe<Scalars['String']>;
+  subrecipients: Array<Maybe<Subrecipient>>;
   updatedAt: Scalars['DateTime'];
   uploadedBy: User;
   uploadedById: Scalars['Int'];
@@ -934,7 +893,7 @@ export type EditUploadByIdVariables = Exact<{
 }>;
 
 
-export type EditUploadById = { __typename?: 'Query', upload?: { __typename?: 'Upload', id: number, filename: string, uploadedById: number, agencyId: number, organizationId: number, reportingPeriodId: number, expenditureCategoryId: number, createdAt: string, updatedAt: string } | null };
+export type EditUploadById = { __typename?: 'Query', upload?: { __typename?: 'Upload', id: number, filename: string, uploadedById: number, agencyId: number, organizationId: number, reportingPeriodId: number, expenditureCategoryId?: number | null, createdAt: string, updatedAt: string } | null };
 
 export type UpdateUploadMutationVariables = Exact<{
   id: Scalars['Int'];
@@ -942,7 +901,7 @@ export type UpdateUploadMutationVariables = Exact<{
 }>;
 
 
-export type UpdateUploadMutation = { __typename?: 'Mutation', updateUpload: { __typename?: 'Upload', id: number, filename: string, uploadedById: number, agencyId: number, organizationId: number, reportingPeriodId: number, expenditureCategoryId: number, createdAt: string, updatedAt: string } };
+export type UpdateUploadMutation = { __typename?: 'Mutation', updateUpload: { __typename?: 'Upload', id: number, filename: string, uploadedById: number, agencyId: number, organizationId: number, reportingPeriodId: number, expenditureCategoryId?: number | null, createdAt: string, updatedAt: string } };
 
 export type CreateUploadMutationVariables = Exact<{
   input: CreateUploadInput;
@@ -963,12 +922,12 @@ export type FindUploadByIdVariables = Exact<{
 }>;
 
 
-export type FindUploadById = { __typename?: 'Query', upload?: { __typename?: 'Upload', id: number, filename: string, uploadedById: number, agencyId: number, organizationId: number, reportingPeriodId: number, expenditureCategoryId: number, createdAt: string, updatedAt: string } | null };
+export type FindUploadById = { __typename?: 'Query', upload?: { __typename?: 'Upload', id: number, filename: string, uploadedById: number, agencyId: number, organizationId: number, reportingPeriodId: number, expenditureCategoryId?: number | null, createdAt: string, updatedAt: string } | null };
 
 export type FindUploadsVariables = Exact<{ [key: string]: never; }>;
 
 
-export type FindUploads = { __typename?: 'Query', uploads: Array<{ __typename?: 'Upload', id: number, filename: string, createdAt: string, updatedAt: string, uploadedBy: { __typename?: 'User', id: number, email: string }, agency: { __typename?: 'Agency', id: number, code: string }, expenditureCategory: { __typename?: 'ExpenditureCategory', id: number, code: string }, validations: Array<{ __typename?: 'UploadValidation', invalidatedAt?: string | null, validatedAt?: string | null } | null> }> };
+export type FindUploads = { __typename?: 'Query', uploads: Array<{ __typename?: 'Upload', id: number, filename: string, createdAt: string, updatedAt: string, uploadedBy: { __typename?: 'User', id: number, email: string }, agency: { __typename?: 'Agency', id: number, code: string }, expenditureCategory?: { __typename?: 'ExpenditureCategory', id: number, code: string } | null, validations: Array<{ __typename?: 'UploadValidation', invalidatedAt?: string | null, validatedAt?: string | null } | null> }> };
 
 export type EditUserByIdVariables = Exact<{
   id: Scalars['Int'];
@@ -1006,9 +965,16 @@ export type FindUserByIdVariables = Exact<{
 
 export type FindUserById = { __typename?: 'Query', user?: { __typename?: 'User', id: number, email: string, name?: string | null, agencyId?: number | null, organizationId: number, role?: RoleEnum | null, createdAt: string, updatedAt: string } | null };
 
+export type agenciesUnderUserOrganizationVariables = Exact<{
+  organizationId: Scalars['Int'];
+}>;
+
+
+export type agenciesUnderUserOrganization = { __typename?: 'Query', agenciesByOrganization: Array<{ __typename?: 'Agency', id: number, name: string }> };
+
 export type FindUsersByOrganizationIdVariables = Exact<{
   organizationId: Scalars['Int'];
 }>;
 
 
-export type FindUsersByOrganizationId = { __typename?: 'Query', usersByOrganization: Array<{ __typename?: 'User', id: number, email: string, name?: string | null, agencyId?: number | null, organizationId: number, role?: RoleEnum | null, createdAt: string, updatedAt: string }> };
+export type FindUsersByOrganizationId = { __typename?: 'Query', usersByOrganization: Array<{ __typename?: 'User', id: number, email: string, name?: string | null, organizationId: number, role?: RoleEnum | null, createdAt: string, updatedAt: string, agency?: { __typename?: 'Agency', name: string } | null }> };