diff --git a/training-front-end/src/components/AdminEditReporting.vue b/training-front-end/src/components/AdminEditReporting.vue
index a3e48a6c..fc560f3c 100644
--- a/training-front-end/src/components/AdminEditReporting.vue
+++ b/training-front-end/src/components/AdminEditReporting.vue
@@ -5,6 +5,7 @@
   import USWDSComboBox from "./USWDSComboBox.vue";
   import { bureauList, agencyList, setSelectedAgencyId, selectedAgencyId} from '../stores/agencies'
   import { useStore } from '@nanostores/vue'
+  import AdminEditUserDetails from "./AdminEditUserDetails.vue";
   
   const props = defineProps({
     user: {
@@ -12,11 +13,13 @@
       required: true,
     }
   })
-
+   
+  const editing = ref(false)
+  
   // Copy to avoid modifying parent prop and allow cancelling edits 
   const agencies = ref([...props.user.report_agencies])
 
-  defineEmits(['cancel', 'save'])
+  const emit = defineEmits(['cancel', 'save', 'userUpdateSuccess'])
 
   const agency_options = useStore(agencyList)
   const bureaus = useStore(bureauList)
@@ -39,96 +42,93 @@
       agencies.value = agencies.value.filter(agency => agency.id != e.id)
     }
   }
+  
+  function editUser(){
+    editing.value = true
+  }
 
   watch(() => user_input.agency_id, async() => {
     setSelectedAgencyId(user_input.agency_id)
   })
+  
+  async function updateUser(successMessage) {
+    emit('userUpdateSuccess', successMessage)
+    editing.value = false
+  }
+  
+  function cancelUpdate() {
+    editing.value = false;
+  }
 </script>
 
 <template>
-  <div class="usa-prose">
-    <h3>
-      Edit User
-    </h3>
-  </div>
-  <div class="grid-row grid-gap">
-    <div class="tablet:grid-col">
-      <label
-        for="input-full-name"
-        class="usa-label"
-      >
-        Full Name
-      </label>
-      <input 
-        id="input-full-name"
-        class="usa-input bg-base-lightest"
-        name="input-full-name"
-        :value="user.name"
-        disabled
-      >
+  <button
+      id="cancel"
+      type="button"
+      class="usa-button usa-button--unstyled margin-y-2"
+      @click="$emit('cancel')"
+  >
+    Return to User Search Results
+  </button>
+  <div v-if="!editing">
+    <div class="usa-prose">
+      <h3>
+        User Profile
+      </h3>
     </div>
-    <div class="tablet:grid-col">
-      <label
-        for="input-email"
-        class="usa-label" 
-      >
-        Email
-      </label>
-      <input
-        id="input-email"
-        class="usa-input bg-base-lightest"
-        name="input-email"
-        :value="user.email" 
-        disabled
-      >
+    <div class="grid-row grid-gap padding-top-4">
+      <div class="tablet:grid-col">
+        <dt class="font-sans-xs">Full Name</dt>
+        <dd id="user-name-value" :aria-label="'User Name: ' + user.name" class="margin-left-0 text-bold font-sans-sm">{{ user.name }}</dd>
+      </div>
+      <div class="tablet:grid-col">
+        <dt class="font-sans-xs">Email</dt>
+        <dd id="user-email-value" :aria-label="'Email: ' + user.email" class="margin-left-0 text-bold font-sans-sm">{{ user.email }}</dd>
+      </div>
     </div>
-  </div>
-  <div class="grid-row grid-gap">
-    <div class="tablet:grid-col">
-      <label 
-        for="input-agency"
-        class="usa-label"
-      >
-        Agency / Organization
-      </label>
-      <input
-        id="input-agency"
-        class="usa-input bg-base-lightest"
-        name="input-agency" 
-        :value="user.agency.name"
-        disabled
-      >
+    <div class="grid-row grid-gap padding-top-2">
+      <div class="tablet:grid-col">
+        <dt class="font-sans-xs">Agency / Organization</dt>
+        <dd id="user-agency-organization-value" :aria-label="'Agency / Organization: ' + user.agency.name" class="margin-left-0 text-bold font-sans-sm">{{ user.agency.name }}</dd>
+      </div>
+      <div class="tablet:grid-col">
+        <dt class="font-sans-xs">Sub-Agency, Organization, or Bureau</dt>
+        <dd id="user-bureau-value" :aria-label="'Sub-Agency, Organization, or Bureau: ' + user.agency.bureau" class="margin-left-0 text-bold font-sans-sm">{{ user.agency.bureau }}</dd>
+      </div>
     </div>
-    <div class="tablet:grid-col">
-      <label
-        class="usa-label"
-        for="input-bureau"
-      >
-        Sub-Agency, Organization, or Bureau
-      </label>
-      <input
-        id="input-bureau"
-        class="usa-input bg-base-lightest"
-        name="input-bureau"
-        :value="user.agency.bureau"
-        disabled
+    <div class="margin-top-3">
+      <button
+          id="toggle-user-edit"
+          class="usa-button usa-button--outline"
+          @click="editUser()"
       >
+        Edit User Profile
+      </button>
     </div>
   </div>
+  <div v-if="editing">
+    <admin-edit-user-details
+    :userToEdit="user"
+    @cancel="cancelUpdate"
+    @complete-user-update="updateUser">
+    </admin-edit-user-details>
+  </div>
   
-  <section class="margin-top-5">
+  
+  <section class="margin-top-5" v-if="!editing">
+    <hr class="margin-bottom-5">
     <div class="usa-prose">
       <h4>
-        Add Agency/Organization Reporting Access
+        Add Reporting Access
       </h4>
     </div>
     <div class="grid-row grid-gap">
-      <div class="tablet:grid-col">
+      <div>
         <USWDSComboBox 
           v-model="user_input.agency_id"
           :items="agency_options"
           name="agency"
-          label="Which agency or organization should this person receive reports for?"
+          label="Select agency or organization user should receive reports for?"
         />
 
         <div 
@@ -145,71 +145,70 @@
         <div class="margin-top-3">
           <button 
             id="update-user"
-            class="usa-button"
+            class="usa-button usa-button--outline"
             @click="$emit('save', user.id, agencies)"
           >
-            Update
+            Add Reporting Access
           </button>
         </div>
-        <button 
-          id="cancel"
-          type="button"
-          class="usa-button usa-button--unstyled margin-y-2"
-          @click="$emit('cancel')"
-        >
-          Cancel and return to search results
-        </button>
       </div>
-      <div class="tablet:grid-col">
-        <table class="usa-table usa-table--borderless width-full">
-          <thead>
-            <tr>
-              <th 
-                scope="col" 
-                class="text-no-wrap"
-              >
-                Agency/Organization
-              </th>
-              <th
-                scope="col"
-                class="text-no-wrap"
-              >
-                Sub-Agency, Org, or Bureau
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr v-if="agencies.length == 0">
-              <td colspan="4">
-                None
-              </td>
-            </tr>
-            <tr 
-              v-for="agency in agencies" 
-              :key="agency.id"
-            >
-              <td>
-                {{ agency.name }}
-              </td>
-              <td>
-                <div class="display-flex flex-justify">
-                  <div>
-                    {{ agency.bureau }}
-                  </div>
-                  <div class="flex-align-self-center">
-                    <button 
-                      class="usa-button usa-button--unstyled font-serif-lg"
-                      @click="editUserAgencies(agency, false)"
-                    >
-                      <DeleteIcon />
-                    </button>
-                  </div>
-                </div>
-              </td>
-            </tr>
-          </tbody>
-        </table>
+    </div>
+  </section>
+  <section class="margin-top-5" v-if="!editing">
+    <div>
+      <div class="usa-prose">
+        <h4>
+          Granted Reporting Access
+        </h4>
       </div>
+      <table class="usa-table usa-table--borderless width-full">
+        <thead>
+        <tr>
+          <th
+              scope="col"
+              class="text-no-wrap"
+          >
+            Agency/Organization
+          </th>
+          <th
+              scope="col"
+              class="text-no-wrap"
+          >
+            Sub-Agency, Org, or Bureau
+          </th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr v-if="agencies.length == 0">
+          <td colspan="4">
+            None
+          </td>
+        </tr>
+        <tr
+            v-for="agency in agencies"
+            :key="agency.id"
+        >
+          <td>
+            {{ agency.name }}
+          </td>
+          <td>
+            <div class="display-flex flex-justify">
+              <div>
+                {{ agency.bureau }}
+              </div>
+              <div class="flex-align-self-center">
+                <button
+                    class="usa-button usa-button--unstyled font-serif-lg"
+                    @click="editUserAgencies(agency, false)"
+                >
+                  <DeleteIcon />
+                </button>
+              </div>
+            </div>
+          </td>
+        </tr>
+        </tbody>
+      </table>
     </div>
   </section>
 </template>
\ No newline at end of file
diff --git a/training-front-end/src/components/AdminEditUserDetails.vue b/training-front-end/src/components/AdminEditUserDetails.vue
new file mode 100644
index 00000000..7013b1d8
--- /dev/null
+++ b/training-front-end/src/components/AdminEditUserDetails.vue
@@ -0,0 +1,227 @@
+<script setup>
+
+import ValidatedInput from "./ValidatedInput.vue";
+import {onBeforeMount, reactive, ref, watch} from "vue";
+import {helpers, required, requiredIf} from "@vuelidate/validators";
+import {useVuelidate} from "@vuelidate/core";
+import ValidatedSelect from "./ValidatedSelect.vue";
+import {useStore} from "@nanostores/vue";
+import {agencyList, bureauList, setSelectedAgencyId} from "../stores/agencies.js";
+import {profile} from "../stores/user.js";
+import USWDSAlert from "./USWDSAlert.vue";
+import SpinnerGraphic from "./SpinnerGraphic.vue";
+
+const props = defineProps({
+  userToEdit: {
+    type: Object,
+    required: true,
+  }
+})
+const user = useStore(profile)
+const base_url = import.meta.env.PUBLIC_API_BASE_URL
+const { withMessage } = helpers
+const agency_options = useStore(agencyList)
+const bureaus = useStore(bureauList)
+const is_saving = ref(false)
+const error = ref()
+const show_error = ref(false)
+const show_spinner = ref(false)
+
+const emit = defineEmits(['cancel', 'completeUserUpdate'])
+
+const currentUserAgencyId = agency_options.value.find(agency => agency.name === props.userToEdit.agency.name).id
+
+const user_input = reactive({
+  name: props.userToEdit.name,
+  email: props.userToEdit.email,
+  agency_id: currentUserAgencyId,
+  bureau_id: props.userToEdit.agency_id
+})
+
+watch(() => user_input.agency_id, async() => {
+  setSelectedAgencyId(user_input.agency_id)
+  user_input.bureau_id = undefined
+})
+
+const validations_all_info = {
+  name: {
+    required: withMessage('Please enter your full name', required)
+  },
+  agency_id: {
+    required: withMessage('Please enter your agency', required),
+  },
+  bureau_id: {
+    requiredIf: withMessage('Please enter your Sub-Agency, Organization, or Bureau', requiredIf(() => bureaus.value.length)),
+  }
+}
+const v_all_info$ = useVuelidate(validations_all_info, user_input)
+
+onBeforeMount(async () => {
+  // Preselect agency based on the current user agency value. 
+  setSelectedAgencyId(user_input.agency_id)
+})
+
+async function update_user_info() {
+  error.value = ref()
+  show_error.value = false
+  const isFormValid = await v_all_info$.value.$validate()
+  
+  if (!isFormValid) {
+    return
+  }
+  is_saving.value = true
+  show_spinner.value = true
+
+  // When user has choosen a bureau use that id instead of the agency
+  let {bureau_id, ...user_data} = user_input
+  if (bureau_id) {
+    user_data.agency_id = bureau_id
+  }
+  
+  const apiURL = new URL(`${base_url}/api/v1/users/${props.userToEdit.id}`)
+  let response = ref();
+  try {
+     response = await fetch(apiURL, {
+      method: 'PATCH',
+      headers: {
+        'Content-Type': 'application/json',
+        'Authorization': `Bearer ${user.value.jwt}`
+      },
+      body: JSON.stringify(user_data)
+    })
+  } catch (error) {
+    setError({
+      name: 'Server Error',
+      message: 'Sorry, we had an error connecting to the server.'
+    })
+    is_saving.value = false
+    show_spinner.value = false
+    return
+  }
+    if (!response.ok) {
+      is_saving.value = false
+      show_spinner.value = false
+      if (response.status === 400) {
+        setError({
+          name: 'Unauthorized',
+          message: 'You are not authorized to edit profile.'
+        })
+        return
+      }
+      if (response.status === 403) {
+        setError({
+          name: 'Unauthorized',
+          message: "You can not update your own profile."
+        })
+        return
+      }
+      setError({
+        name: 'Error',
+        message: "Error contacting server."
+      })
+      return
+    }
+    is_saving.value = false
+    show_spinner.value = false
+    let updatedUser = await response.json()
+    let successMessage = `Successfully updated ${updatedUser.email}`
+    emit('completeUserUpdate', successMessage)
+}
+
+function setError(event){
+  error.value = event
+  show_error.value = true
+}
+</script>
+
+<template>
+  <div class="usa-prose">
+    <h3>
+      Edit User Profile
+    </h3>
+  </div>
+  <USWDSAlert
+      v-if="show_error"
+      status="error"
+      :heading="error.name"
+  >
+    {{ error.message }}
+  </USWDSAlert>
+  <form class="margin-bottom-3" @submit.prevent="update_user_info">
+    <div class="grid-row grid-gap">
+      <div class="tablet:grid-col">
+        <ValidatedInput
+            v-model="user_input.name"
+            client:load
+            :validator="v_all_info$.name"
+            label="Full Name"
+            name="name"
+        />
+      </div>
+      <div class="tablet:grid-col">
+        <label
+            for="input-email"
+            class="usa-label"
+        >
+          Email
+        </label>
+        <input
+            id="input-email"
+            class="usa-input bg-base-lightest"
+            name="input-email"
+            :value="userToEdit.email"
+            :readonly="true"
+        >
+      </div>
+    </div>
+    <div class="grid-row grid-gap">
+      <div class="tablet:grid-col">
+        <ValidatedSelect
+            v-model="user_input.agency_id"
+            client:load
+            :validator="v_all_info$.agency_id"
+            :options="agency_options"
+            label="Agency / organization"
+            name="agency"
+        />
+      </div>
+      <div class="tablet:grid-col">
+        <ValidatedSelect
+            v-if="bureaus.length"
+            v-model="user_input.bureau_id"
+            client:load
+            :validator="v_all_info$.bureau_id"
+            :options="bureaus"
+            label="Sub-Agency, Organization, or Bureau"
+            name="bureau"
+        />
+      </div>
+    </div>
+    <div class="grid-row grid-gap margin-top-3">
+      <div class="tablet:grid-col">
+        <input
+            class="usa-button"
+            type="submit"
+            value="Save Profile"
+            :disabled="is_saving"
+        >
+        <button
+            id="cancel"
+            type="button"
+            class="usa-button usa-button--outline"
+            @click="$emit('cancel')"
+            :disabled="is_saving"
+        >
+          Cancel
+        </button>
+        <div
+            v-if="show_spinner"
+            class="display-none tablet:display-block tablet:grid-col-1 tablet:padding-top-3 tablet:margin-left-neg-1"
+        >
+          <SpinnerGraphic />
+        </div>
+      </div>
+    </div>
+  </form>
+  
+</template>
diff --git a/training-front-end/src/components/AdminSearchUser.vue b/training-front-end/src/components/AdminSearchUser.vue
index 5d18e418..15c0a294 100644
--- a/training-front-end/src/components/AdminSearchUser.vue
+++ b/training-front-end/src/components/AdminSearchUser.vue
@@ -16,15 +16,17 @@
   const report_url = `${base_url}/api/v1/users/`
   const update_url = `${base_url}/api/v1/users/edit-user-for-reporting/`
 
-  const currentPage = ref(0)
-  const numberOfResults = ref(0)
+  let currentPage = ref(0)
+  let numberOfResults = ref(0)
   const numberOfPages = computed(() => Math.ceil(numberOfResults.value/PAGE_SIZE))
 
-  const searchTerm = ref('')
+  let searchTerm = ref('')
   const selectedUser = ref()
-  const searchResults = ref([])
+  let searchResults = ref([])
   const noResults = ref(false)
   const error = ref()
+  const showSuccessMessage = ref(false)
+  const successMessage = ref()
 
   async function setPage(page) {
     currentPage.value = page
@@ -32,6 +34,7 @@
   }
 
   async function search() {
+    clearAlerts()
     noResults.value = false
     const url = new URL(`${report_url}`)
     url.search = new URLSearchParams({searchText: searchTerm.value, page_number: currentPage.value + 1})
@@ -94,6 +97,22 @@
     setCurrentUser(undefined)
     setSelectedAgencyId(undefined)
   }
+  
+  async function updateUserSuccess(message) {
+    successMessage.value = message
+    showSuccessMessage.value = true
+    cancelEdit()
+    currentPage.value = 0
+    numberOfResults.value = 0
+    searchTerm.value = ''
+    searchResults.value = []
+  }
+  
+  function clearAlerts() {
+    error.value = undefined
+    successMessage.value = undefined
+    showSuccessMessage.value = false
+  }
 </script>
 
 <template>
@@ -105,6 +124,14 @@
     >
       {{ error.message }}
     </USWDSAlert>
+    <USWDSAlert
+        v-if="showSuccessMessage"
+        status="success"
+        class="usa-alert--slim"
+        :has-heading="false"
+    >
+      {{successMessage}}
+    </USWDSAlert>
     <div 
       v-if="!selectedUser"
       class="grid-row"
@@ -139,6 +166,7 @@
             <button 
               class="usa-button"
               type="submit"
+              :disabled="!searchTerm"
             >
               <span class="usa-search__submit-text">
                 Search
@@ -174,6 +202,7 @@
         :user="selectedUser"
         @save="updateUserReports"
         @cancel="cancelEdit"
+        @user-update-success="updateUserSuccess"
       />
     </div>
   </div>
diff --git a/training-front-end/src/components/ValidatedInput.vue b/training-front-end/src/components/ValidatedInput.vue
index 53cbf089..3b635044 100644
--- a/training-front-end/src/components/ValidatedInput.vue
+++ b/training-front-end/src/components/ValidatedInput.vue
@@ -51,7 +51,7 @@
     </span>
     <input
       :id="name"
-      class="usa-input usa-input tablet:grid-col-8"
+      class="usa-input usa-input"
       :class="{ 'usa-input--error':validator.$error, 'error-focus': validator.$error }"
       :name="name"
       :value="modelValue"
diff --git a/training-front-end/src/components/ValidatedSelect.vue b/training-front-end/src/components/ValidatedSelect.vue
index f45c35d3..3b26d396 100644
--- a/training-front-end/src/components/ValidatedSelect.vue
+++ b/training-front-end/src/components/ValidatedSelect.vue
@@ -3,7 +3,7 @@
   
   const props = defineProps({
     'modelValue': {
-      type: String,
+      type: [String, Number],
       required: false,
       default: undefined
     },
diff --git a/training-front-end/src/components/__tests__/AdminEditReporting.spec.js b/training-front-end/src/components/__tests__/AdminEditReporting.spec.js
index 13cc27a5..0679c26a 100644
--- a/training-front-end/src/components/__tests__/AdminEditReporting.spec.js
+++ b/training-front-end/src/components/__tests__/AdminEditReporting.spec.js
@@ -17,15 +17,15 @@ describe('AdminAgencySelect', async () => {
   it('displays the basic user information', async () => {
     const props = {user: users[0]}
     const wrapper = mount(AdminEditReporting, {props})
-    const name = wrapper.find('input[id="input-full-name"]')
-    const email = wrapper.find('input[id="input-email"]')
-    const agency = wrapper.find('input[id="input-agency"]')
-    const bureau = wrapper.find('input[id="input-bureau"]')
-
-    expect(name.element.value).toBe('Hugh Steeply')
-    expect(email.element.value).toBe('helen.steeply@ous.gov')
-    expect(agency.element.value).toBe('Office of Unspecified Services')
-    expect(bureau.element.value).toBe('Secret Service')
+    const name = wrapper.find('dd[id="user-name-value"]')
+    const email = wrapper.find('dd[id="user-email-value"]')
+    const agency = wrapper.find('dd[id="user-agency-organization-value"]')
+    const bureau = wrapper.find('dd[id="user-bureau-value"]')
+
+    expect(name.text()).toContain('Hugh Steeply')
+    expect(email.text()).toContain('helen.steeply@ous.gov')
+    expect(agency.text()).toContain('Office of Unspecified Services')
+    expect(bureau.text()).toContain('Secret Service')
   })
 
   it('displays table with header and user reporting agencies', async () => {
diff --git a/training-front-end/src/pages/admin/index.astro b/training-front-end/src/pages/admin/index.astro
index 908c9392..4c6af8f4 100644
--- a/training-front-end/src/pages/admin/index.astro
+++ b/training-front-end/src/pages/admin/index.astro
@@ -27,7 +27,7 @@ const pageTitle = "Admin Panel";
               </p>
             </div>         
             <div class="usa-card__footer">
-                <a href="user_search" class="card_link usa-button">
+                <a href="admin/user_search" class="card_link usa-button">
                   Search for users
                 </a>
             </div>
diff --git a/training/api/api_v1/users.py b/training/api/api_v1/users.py
index 630cbca6..359ed8be 100644
--- a/training/api/api_v1/users.py
+++ b/training/api/api_v1/users.py
@@ -3,7 +3,7 @@
 import logging
 from training.api.auth import RequireRole
 from fastapi import APIRouter, status, HTTPException, Response, Depends, Query
-from training.schemas import User, UserCreate, UserSearchResult
+from training.schemas import User, UserCreate, UserSearchResult, UserUpdate
 from training.repositories import UserRepository
 from training.api.deps import user_repository
 from training.api.auth import user_from_form
@@ -14,9 +14,9 @@
 
 @router.post("/users", response_model=User, status_code=status.HTTP_201_CREATED)
 def create_user(
-    new_user: UserCreate,
-    repo: UserRepository = Depends(user_repository),
-    user=Depends(RequireRole(["Admin"]))
+        new_user: UserCreate,
+        repo: UserRepository = Depends(user_repository),
+        user=Depends(RequireRole(["Admin"]))
 ):
     db_user = repo.find_by_email(new_user.email)
     if db_user:
@@ -31,10 +31,10 @@ def create_user(
 
 @router.patch("/users/edit-user-for-reporting", response_model=User)
 def edit_user_for_reporting(
-    user_id: int,
-    agency_id_list: list[int],
-    repo: UserRepository = Depends(user_repository),
-    user=Depends(RequireRole(["Admin"]))
+        user_id: int,
+        agency_id_list: list[int],
+        repo: UserRepository = Depends(user_repository),
+        user=Depends(RequireRole(["Admin"]))
 ):
     try:
         updated_user = repo.edit_user_for_reporting(user_id, agency_id_list)
@@ -72,10 +72,10 @@ def download_report_csv(user=Depends(user_from_form), repo: UserRepository = Dep
 
 @router.get("/users", response_model=UserSearchResult)
 def get_users(
-    searchText: Annotated[str, Query(min_length=1)],
-    page_number: int = 1,
-    repo: UserRepository = Depends(user_repository),
-    user=Depends(RequireRole(["Admin"]))
+        searchText: Annotated[str, Query(min_length=1)],
+        page_number: int = 1,
+        repo: UserRepository = Depends(user_repository),
+        user=Depends(RequireRole(["Admin"]))
 ):
     '''
     Get/users is used to search users for admin portal
@@ -85,3 +85,33 @@ def get_users(
     It returns UserSearchResult object with a list of users and total_count used for UI pagination
     '''
     return repo.get_users(searchText, page_number)
+
+
+@router.patch("/users/{user_id}", response_model=User)
+def update_user_by_id(
+        user_id: int,
+        updated_user: UserUpdate,
+        repo: UserRepository = Depends(user_repository),
+        user=Depends(RequireRole(["Admin"]))
+):
+    """
+    Updates user details by User ID
+    :param updated_user: Updated user model
+    :param user_id: User ID
+    :param repo: UserRepository repository
+    :param user: Required role to complete operation
+    :return: Returns the updated user object
+    """
+    if user["id"] == user_id:
+        raise HTTPException(
+            status_code=status.HTTP_403_FORBIDDEN,
+            detail="Can not update your own profile"
+        )
+    try:
+        logging.info(f"{user['email']} updated user {updated_user.email} user profile")
+        return repo.update_user(user_id, updated_user)
+    except ValueError:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="invalid user id"
+        )
diff --git a/training/repositories/user.py b/training/repositories/user.py
index 9f946a03..9f62e903 100644
--- a/training/repositories/user.py
+++ b/training/repositories/user.py
@@ -76,3 +76,18 @@ def get_users(self, searchText: str, page_number: int) -> UserSearchResult:
                 or_(models.User.name.ilike(f"%{searchText}%"), models.User.email.ilike(f"%{searchText}%"))).limit(page_size).offset(offset).all()
             user_search_result = UserSearchResult(users=search_results, total_count=count)
             return user_search_result
+
+    def update_user(self, user_id: int, user: schemas.UserUpdate) -> models.User:
+        """
+        Updates user name and agency values
+        :param user_id: User's ID to update
+        :param user: User object with updated values
+        :return: Updated User object
+        """
+        db_user = self.find_by_id(user_id)
+        if db_user is None:
+            raise ValueError("invalid user id")
+        db_user.name = user.name
+        db_user.agency_id = user.agency_id
+        self._session.commit()
+        return db_user
diff --git a/training/schemas/__init__.py b/training/schemas/__init__.py
index c862d76a..ab426a90 100644
--- a/training/schemas/__init__.py
+++ b/training/schemas/__init__.py
@@ -1,6 +1,6 @@
 from .agency import Agency, AgencyCreate, AgencyWithBureaus
 from .temp_user import TempUser, IncompleteTempUser, WebDestination
-from .user import User, UserCreate, UserQuizCompletionReportData, UserSearchResult, UserJWT
+from .user import User, UserCreate, UserQuizCompletionReportData, UserSearchResult, UserJWT, UserUpdate
 from .quiz_choice import QuizChoice, QuizChoiceCreate, QuizChoicePublic
 from .quiz_question import QuizQuestion, QuizQuestionCreate, QuizQuestionPublic, QuizQuestionType
 from .quiz_content import QuizContent, QuizContentCreate, QuizContentPublic
diff --git a/training/schemas/user.py b/training/schemas/user.py
index d4bd44f7..99296dc4 100644
--- a/training/schemas/user.py
+++ b/training/schemas/user.py
@@ -14,6 +14,10 @@ class UserCreate(UserBase):
     pass
 
 
+class UserUpdate(UserBase):
+    agency_id: int
+
+
 class User(UserBase):
     id: int
     agency_id: int
@@ -24,6 +28,7 @@ class User(UserBase):
     def is_admin(self) -> bool:
         role_names = [role.name.upper() for role in self.roles]
         return "Admin".upper() in role_names
+
     model_config = ConfigDict(from_attributes=True)
 
 
diff --git a/training/tests/test_api_users.py b/training/tests/test_api_users.py
index b079efe8..4e07b2c6 100644
--- a/training/tests/test_api_users.py
+++ b/training/tests/test_api_users.py
@@ -13,6 +13,7 @@
 @pytest.fixture
 def admin_user():
     return {
+        'id': 1,
         'name': 'Albus Dumbledore',
         'email': 'dumbledore@hogwarts.edu',
         'roles': ['Admin']
@@ -86,3 +87,33 @@ def test_edit_user_for_reporting(mock_user_repo: UserRepository, goodJWT: str):
     assert response.status_code == status.HTTP_200_OK
     assert role.model_dump() in response.json()["roles"]
     assert agency.model_dump() in response.json()["report_agencies"]
+
+
+def test_edit_user_details(mock_user_repo: UserRepository, goodJWT: str):
+    updated_user = UserSchemaFactory.build()
+    updated_user.name = "some name"
+    updated_user.agency_id = 1
+    mock_user_repo.update_user.return_value = updated_user
+    user_id = updated_user.id
+    URL = f"/api/v1/users/{user_id}"
+    response = client.patch(
+        URL,
+        json=updated_user.model_dump(),
+        headers={"Authorization": f"Bearer {goodJWT}"}
+    )
+    assert response.status_code == status.HTTP_200_OK
+    assert response.json()["name"] == updated_user.name
+    assert response.json()["agency_id"] == updated_user.agency_id
+
+
+def test_edit_user_details_same_user(mock_user_repo: UserRepository, goodJWT: str):
+    updated_user = UserSchemaFactory.build()
+    mock_user_repo.update_user.return_value = updated_user
+    user_id = 1
+    URL = f"/api/v1/users/{user_id}"
+    response = client.patch(
+        URL,
+        json=updated_user.model_dump(),
+        headers={"Authorization": f"Bearer {goodJWT}"}
+    )
+    assert response.status_code == status.HTTP_403_FORBIDDEN
diff --git a/training/tests/test_user_repository.py b/training/tests/test_user_repository.py
index a6905998..f357190f 100644
--- a/training/tests/test_user_repository.py
+++ b/training/tests/test_user_repository.py
@@ -117,3 +117,31 @@ def test_get_users_by_email(user_repo_with_data: UserRepository, valid_user_ids:
     assert result is not None
     for item in result.users:
         assert search_criteria in item.email
+
+
+def test_update_user_passing(user_repo_with_data: UserRepository, agency_repo_with_data: AgencyRepository):
+    agency_id = agency_repo_with_data.find_all()[0].id
+    user_id = user_repo_with_data.find_all()[0]
+    updated_user = models.User(
+        email="updateduser@example.com",
+        name="Updated User",
+        agency_id=agency_id,
+    )
+
+    result = user_repo_with_data.update_user(user_id.id, updated_user)
+    assert result is not None
+    assert result.name == "Updated User"
+    assert result.agency_id == agency_id
+    assert result.email != "updateduser@example.com"
+
+
+def test_update_user_invalid_user(user_repo_with_data: UserRepository):
+    invalid_user_id = 0
+    updated_user = models.User(
+        email="updateduser@example.com",
+        name="Updated User",
+        agency_id=1,
+    )
+
+    with pytest.raises(Exception):
+        user_repo_with_data.update_user(invalid_user_id, updated_user)