diff --git a/src/components/AppLoader/init.ts b/src/components/AppLoader/init.ts
index 197a8e5b33..4418f77ba7 100644
--- a/src/components/AppLoader/init.ts
+++ b/src/components/AppLoader/init.ts
@@ -149,7 +149,7 @@ export async function initializeAsync({
     const meResponse = await querySingleResource({
         resource: 'me',
         params: {
-            fields: 'id,firstName,surname,username,userRoles[id],userGroups[id],' +
+            fields: 'id,firstName,surname,userRoles[id],userGroups[id],' +
                 'organisationUnits[id,path],teiSearchOrganisationUnits[id,path],settings',
         },
     });
@@ -158,7 +158,6 @@ export async function initializeAsync({
         id: currentUserId,
         firstName = '',
         surname = '',
-        username = '',
         userRoles = [],
         userGroups = [],
         organisationUnits: captureScope = [],
@@ -169,7 +168,6 @@ export async function initializeAsync({
     CurrentUser.set({
         firstName,
         surname,
-        username,
         uiLocale: userSettings?.keyUiLocale ?? '',
         userRoles: userRoles.map((role: { id: string }) => role.id),
         organisationUnits: captureScope,
diff --git a/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/epics/addNoteForNewSingleEvent.epics.ts b/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/epics/addNoteForNewSingleEvent.epics.ts
index 9ee62255b6..007622f155 100644
--- a/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/epics/addNoteForNewSingleEvent.epics.ts
+++ b/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/epics/addNoteForNewSingleEvent.epics.ts
@@ -27,7 +27,7 @@ export const addNoteForNewSingleEventEpic = (
         ofType(newEventDataEntryActionTypes.ADD_NEW_EVENT_NOTE),
         map((action) => {
             const payload = action.payload;
-            const { firstName, surname, username } = CurrentUser.get();
+            const { firstName, surname } = CurrentUser.get();
             const clientId = uuid();
             const note = {
                 value: payload.note,
@@ -36,7 +36,6 @@ export const addNoteForNewSingleEventEpic = (
                     surname,
                     uid: clientId,
                 },
-                storedBy: username,
                 storedAt: fromClientDate(moment().toISOString()).getServerZonedISOString(),
                 clientId: uuid(),
             };
diff --git a/src/core_modules/capture-core/components/Notes/Notes.component.tsx b/src/core_modules/capture-core/components/Notes/Notes.component.tsx
index dfd4bfc064..da815c2a53 100644
--- a/src/core_modules/capture-core/components/Notes/Notes.component.tsx
+++ b/src/core_modules/capture-core/components/Notes/Notes.component.tsx
@@ -180,9 +180,7 @@ const NotesPlain = ({
                             label={<>
                                 <div className={classes.noteItemHeader}>
                                     <div className={classes.noteItemUser} data-test="note-user">
-                                        {n.createdBy ?
-                                            `${n.createdBy.firstName} ${n.createdBy.surname}`
-                                            : `${n.storedBy}` }
+                                        {n.createdBy && `${n.createdBy.firstName} ${n.createdBy.surname}`}
                                     </div>
                                     <div className={classes.noteItemDate} data-test="note-date">
                                         <span>
diff --git a/src/core_modules/capture-core/components/Notes/notes.types.ts b/src/core_modules/capture-core/components/Notes/notes.types.ts
index 4aa088a5a0..4fcb075d6f 100644
--- a/src/core_modules/capture-core/components/Notes/notes.types.ts
+++ b/src/core_modules/capture-core/components/Notes/notes.types.ts
@@ -1,6 +1,5 @@
 export type Note = {
     clientId: string;
-    storedBy: string;
     createdBy?: {
         firstName: string;
         surname: string;
diff --git a/src/core_modules/capture-core/components/Pages/ViewEvent/Notes/viewEventNotes.epics.ts b/src/core_modules/capture-core/components/Pages/ViewEvent/Notes/viewEventNotes.epics.ts
index 2b0fc3a0e7..0f17195463 100644
--- a/src/core_modules/capture-core/components/Pages/ViewEvent/Notes/viewEventNotes.epics.ts
+++ b/src/core_modules/capture-core/components/Pages/ViewEvent/Notes/viewEventNotes.epics.ts
@@ -54,7 +54,7 @@ export const addNoteForViewEventEpic = (action$: any, store: any, { fromClientDa
             const payload = action.payload;
             const eventId = state.viewEventPage.eventId;
             const useNewEndpoint = featureAvailable(FEATURES.newNoteEndpoint);
-            const { firstName, surname, username } = CurrentUser.get();
+            const { firstName, surname } = CurrentUser.get();
             const clientId = uuid();
             const serverData = createServerData(eventId, payload.note, useNewEndpoint);
 
@@ -65,7 +65,6 @@ export const addNoteForViewEventEpic = (action$: any, store: any, { fromClientDa
                     surname,
                     uid: clientId,
                 },
-                storedBy: username,
                 storedAt: fromClientDate(moment().toISOString()).getServerZonedISOString(),
                 clientId: uuid(),
             };
diff --git a/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/useCommonEnrollmentDomainData/useCommonEnrollmentDomainData.types.ts b/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/useCommonEnrollmentDomainData/useCommonEnrollmentDomainData.types.ts
index 20cdf66a7d..195acc194a 100644
--- a/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/useCommonEnrollmentDomainData/useCommonEnrollmentDomainData.types.ts
+++ b/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/useCommonEnrollmentDomainData/useCommonEnrollmentDomainData.types.ts
@@ -20,7 +20,6 @@ export type EnrollmentData = {
     orgUnit?: string;
     program?: string;
     status?: string;
-    storedBy?: string;
     scheduledAt?: string;
     trackedEntity?: string;
     trackedEntityType?: string;
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/epics/dataEntryNote.epics.ts b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/epics/dataEntryNote.epics.ts
index 82b9f81957..8f140dfc4e 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/epics/dataEntryNote.epics.ts
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/epics/dataEntryNote.epics.ts
@@ -21,7 +21,7 @@ export const addNoteForNewEnrollmentEventEpic = (
         ofType(newEventWidgetDataEntryActionTypes.EVENT_NOTE_ADD),
         map((action: any) => {
             const payload = action.payload;
-            const { firstName, surname, username } = CurrentUser.get();
+            const { firstName, surname } = CurrentUser.get();
             const clientId = uuid();
             const note = {
                 value: payload.note,
@@ -30,7 +30,6 @@ export const addNoteForNewEnrollmentEventEpic = (
                     surname,
                     uid: clientId,
                 },
-                storedBy: username,
                 storedAt: fromClientDate(moment().toISOString()).getServerZonedISOString(),
                 clientId: uuid(),
             };
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentNote/WidgetEnrollmentNote.epics.ts b/src/core_modules/capture-core/components/WidgetEnrollmentNote/WidgetEnrollmentNote.epics.ts
index 609f3a200e..111a6304da 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentNote/WidgetEnrollmentNote.epics.ts
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentNote/WidgetEnrollmentNote.epics.ts
@@ -33,7 +33,7 @@ export const addNoteForEnrollmentEpic = (
             const state = store.value;
             const { enrollmentId, note } = action.payload;
             const useNewEndpoint = featureAvailable(FEATURES.newNoteEndpoint);
-            const { firstName, surname, username } = CurrentUser.get();
+            const { firstName, surname } = CurrentUser.get();
             const clientId = uuid();
 
             const serverData = createServerData(note, useNewEndpoint);
@@ -45,7 +45,6 @@ export const addNoteForEnrollmentEpic = (
                     surname,
                     uid: clientId,
                 },
-                storedBy: username,
                 storedAt: fromClientDate(moment().toISOString()).getServerZonedISOString(),
             };
 
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentNote/WidgetEnrollmentNote.types.ts b/src/core_modules/capture-core/components/WidgetEnrollmentNote/WidgetEnrollmentNote.types.ts
index 4f3470de6e..9a2fc3a167 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentNote/WidgetEnrollmentNote.types.ts
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentNote/WidgetEnrollmentNote.types.ts
@@ -5,7 +5,6 @@ export type ClientNote = {
         surname: string;
         uid: string;
     };
-    storedBy: string;
     storedAt: string;
 };
 
diff --git a/src/core_modules/capture-core/components/WidgetEventNote/WidgetEventNote.epics.ts b/src/core_modules/capture-core/components/WidgetEventNote/WidgetEventNote.epics.ts
index 9fca9c4e59..48d41b376b 100644
--- a/src/core_modules/capture-core/components/WidgetEventNote/WidgetEventNote.epics.ts
+++ b/src/core_modules/capture-core/components/WidgetEventNote/WidgetEventNote.epics.ts
@@ -48,7 +48,7 @@ export const addNoteForEventEpic = (
             const payload = action.payload;
             const eventId = state.dataEntries[payload.dataEntryId].eventId;
             const useNewEndpoint = featureAvailable(FEATURES.newNoteEndpoint);
-            const { firstName, surname, username } = CurrentUser.get();
+            const { firstName, surname } = CurrentUser.get();
             const clientId = uuid();
 
             const serverData = createServerData(eventId, payload.note, useNewEndpoint);
@@ -60,7 +60,6 @@ export const addNoteForEventEpic = (
                     surname,
                     uid: clientId,
                 },
-                storedBy: username,
                 storedAt: fromClientDate(moment().toISOString()).getServerZonedISOString(),
             };
             const formNote: FormNote = {
diff --git a/src/core_modules/capture-core/components/WidgetEventNote/WidgetEventNote.types.ts b/src/core_modules/capture-core/components/WidgetEventNote/WidgetEventNote.types.ts
index 87957e6627..021ea17a7f 100644
--- a/src/core_modules/capture-core/components/WidgetEventNote/WidgetEventNote.types.ts
+++ b/src/core_modules/capture-core/components/WidgetEventNote/WidgetEventNote.types.ts
@@ -10,7 +10,6 @@ export type ClientNote = {
         surname: string;
         uid: string;
     };
-    storedBy: string;
     storedAt: string;
 };
 
diff --git a/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.actions.ts b/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.actions.ts
index 193dd59454..5375284527 100644
--- a/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.actions.ts
+++ b/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.actions.ts
@@ -27,7 +27,6 @@ export const requestScheduleEvent = ({
     notes: Array<{
         value: string;
         storedAt?: string;
-        storedBy?: string;
         createdBy?: any;
         note?: string;
     }>;
diff --git a/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.container.tsx b/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.container.tsx
index 8632883180..7af5e914cd 100644
--- a/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.container.tsx
+++ b/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.container.tsx
@@ -75,7 +75,6 @@ export const WidgetEventSchedule = ({
     const [notes, setNotes] = useState<Array<{
         value: string;
         storedAt: string;
-        storedBy?: string;
         createdBy?: any;
         note?: string;
     }>>([]);
@@ -148,9 +147,8 @@ export const WidgetEventSchedule = ({
     ]);
 
     const onAddNote = (note: string) => {
-        const { username, firstName, surname } = CurrentUser.get();
+        const { firstName, surname } = CurrentUser.get();
         const newNote = {
-            storedBy: username,
             storedAt: fromClientDate(moment().toISOString()).getServerZonedISOString(),
             value: note,
             createdBy: { firstName, surname },
diff --git a/src/core_modules/capture-core/components/WidgetEventSchedule/widgetEventSchedule.types.ts b/src/core_modules/capture-core/components/WidgetEventSchedule/widgetEventSchedule.types.ts
index ed62d7f988..1e3efe8dc9 100644
--- a/src/core_modules/capture-core/components/WidgetEventSchedule/widgetEventSchedule.types.ts
+++ b/src/core_modules/capture-core/components/WidgetEventSchedule/widgetEventSchedule.types.ts
@@ -58,7 +58,6 @@ export type Props = {
    notes: Array<{
       value: string;
       storedAt: string;
-      storedBy?: string;
       createdBy?: any;
       note?: string;
    }>;
diff --git a/src/core_modules/capture-core/utils/userInfo/CurrentUser.ts b/src/core_modules/capture-core/utils/userInfo/CurrentUser.ts
index eb8be00328..61edda9b95 100644
--- a/src/core_modules/capture-core/utils/userInfo/CurrentUser.ts
+++ b/src/core_modules/capture-core/utils/userInfo/CurrentUser.ts
@@ -6,7 +6,6 @@ export type OrgUnitRef = {
 export type CurrentUserType = {
     firstName: string;
     surname: string;
-    username: string;
     uiLocale: string;
     userRoles: string[];
     organisationUnits: OrgUnitRef[];