diff --git a/src/components/activity/ActivityAnchorForm.svelte.test.ts b/src/components/activity/ActivityAnchorForm.svelte.test.ts
index b687006af8..0da6e9975f 100644
--- a/src/components/activity/ActivityAnchorForm.svelte.test.ts
+++ b/src/components/activity/ActivityAnchorForm.svelte.test.ts
@@ -11,6 +11,7 @@ describe('Activity Anchor Form component', () => {
       applied_preset: null,
       arguments: {},
       created_at: '2022-08-03T18:21:51',
+      created_by: 'admin',
       id: 12,
       last_modified_arguments_at: '2022-08-03T21:53:22',
       last_modified_at: '2022-08-03T21:53:22',
@@ -28,6 +29,7 @@ describe('Activity Anchor Form component', () => {
       applied_preset: null,
       arguments: {},
       created_at: '2022-08-03T18:21:51',
+      created_by: 'admin',
       id: 13,
       last_modified_arguments_at: '2022-08-03T21:53:22',
       last_modified_at: '2022-08-03T21:53:22',
@@ -45,6 +47,7 @@ describe('Activity Anchor Form component', () => {
       applied_preset: null,
       arguments: {},
       created_at: '2022-08-03T18:21:51',
+      created_by: 'admin',
       id: 14,
       last_modified_arguments_at: '2022-08-03T21:53:22',
       last_modified_at: '2022-08-03T21:53:22',
@@ -62,6 +65,7 @@ describe('Activity Anchor Form component', () => {
       applied_preset: null,
       arguments: {},
       created_at: '2022-08-03T18:21:51',
+      created_by: 'admin',
       id: 15,
       last_modified_arguments_at: '2022-08-03T21:53:22',
       last_modified_at: '2022-08-03T21:53:22',
diff --git a/src/components/activity/ActivityDirectiveForm.svelte b/src/components/activity/ActivityDirectiveForm.svelte
index ac06ceb8cc..96e13d35c6 100644
--- a/src/components/activity/ActivityDirectiveForm.svelte
+++ b/src/components/activity/ActivityDirectiveForm.svelte
@@ -602,6 +602,13 @@
           </Input>
         </Highlight>
 
+        <Highlight highlight={highlightKeysMap.last_modified_by}>
+          <Input layout="inline">
+            <label use:tooltip={{ content: 'Created By', placement: 'top' }} for="createdBy"> Created By </label>
+            <input class="st-input w-100" disabled name="createdBy" value={activityDirective.created_by} />
+          </Input>
+        </Highlight>
+
         <Highlight highlight={highlightKeysMap.source_scheduling_goal_id}>
           <Input layout="inline">
             <label
diff --git a/src/components/activity/ActivityDirectivesTablePanel.svelte b/src/components/activity/ActivityDirectivesTablePanel.svelte
index cd8aa7cafd..3053139763 100644
--- a/src/components/activity/ActivityDirectivesTablePanel.svelte
+++ b/src/components/activity/ActivityDirectivesTablePanel.svelte
@@ -94,6 +94,14 @@
       resizable: true,
       sortable: true,
     },
+    created_by: {
+      field: 'created_by',
+      filter: 'text',
+      headerName: 'Created By',
+      hide: true,
+      resizable: true,
+      sortable: true,
+    },
     derived_start_time: {
       field: 'derived_start_time',
       filter: 'text',
@@ -137,6 +145,14 @@
       resizable: true,
       sortable: true,
     },
+    last_modified_by: {
+      field: 'last_modified_by',
+      filter: 'text',
+      headerName: 'Last Modified By',
+      hide: true,
+      resizable: true,
+      sortable: true,
+    },
     metadata: {
       field: 'metadata',
       filter: 'text',
diff --git a/src/components/plan/PlanMergeReview.test.ts b/src/components/plan/PlanMergeReview.test.ts
index 7319b536e5..021e476e00 100644
--- a/src/components/plan/PlanMergeReview.test.ts
+++ b/src/components/plan/PlanMergeReview.test.ts
@@ -129,6 +129,7 @@ describe('PlanMergeReview component', () => {
           applied_preset: null,
           arguments: {},
           created_at: '2023-02-16T17:48:26',
+          created_by: 'admin',
           id: 1,
           last_modified_arguments_at: '2023-02-16T17:48:26',
           last_modified_at: '2023-02-16T17:48:26',
@@ -150,6 +151,7 @@ describe('PlanMergeReview component', () => {
           applied_preset: null,
           arguments: {},
           created_at: '2023-02-16T17:48:26',
+          created_by: 'admin',
           id: 1,
           last_modified_arguments_at: '2023-02-16T17:48:26',
           last_modified_at: '2023-02-16T17:48:47',
@@ -190,6 +192,7 @@ describe('PlanMergeReview component', () => {
           applied_preset: null,
           arguments: {},
           created_at: '2023-02-16T17:48:26',
+          created_by: 'admin',
           id: 1,
           last_modified_arguments_at: '2023-02-16T17:48:26',
           last_modified_at: '2023-02-16T17:48:26',
@@ -209,6 +212,7 @@ describe('PlanMergeReview component', () => {
           applied_preset: null,
           arguments: {},
           created_at: '2023-02-16T17:48:26',
+          created_by: 'admin',
           id: 2,
           last_modified_arguments_at: '2023-02-16T17:48:26',
           last_modified_at: '2023-02-16T17:48:47',
@@ -250,6 +254,7 @@ describe('PlanMergeReview component', () => {
           applied_preset: null,
           arguments: {},
           created_at: '2023-02-16T20:41:07',
+          created_by: 'admin',
           id: 6,
           last_modified_arguments_at: '2023-02-16T20:41:07',
           last_modified_at: '2023-02-16T20:41:07',
@@ -276,6 +281,7 @@ describe('PlanMergeReview component', () => {
           applied_preset: null,
           arguments: {},
           created_at: '2023-02-16T20:41:09',
+          created_by: 'admin',
           id: 7,
           last_modified_arguments_at: '2023-02-16T20:41:09',
           last_modified_at: '2023-02-16T20:41:09',
@@ -299,6 +305,7 @@ describe('PlanMergeReview component', () => {
           applied_preset: null,
           arguments: {},
           created_at: '2023-02-16T20:40:57',
+          created_by: 'admin',
           id: 5,
           last_modified_arguments_at: '2023-02-16T20:40:57',
           last_modified_at: '2023-02-16T20:40:57',
@@ -317,6 +324,7 @@ describe('PlanMergeReview component', () => {
           applied_preset: null,
           arguments: {},
           created_at: '2023-02-16T20:40:57',
+          created_by: 'admin',
           id: 5,
           last_modified_arguments_at: '2023-02-16T20:40:57',
           last_modified_at: '2023-02-16T20:40:57',
diff --git a/src/types/activity.ts b/src/types/activity.ts
index 2411159ef9..567afa90fd 100644
--- a/src/types/activity.ts
+++ b/src/types/activity.ts
@@ -39,6 +39,7 @@ export type ActivityDirective = {
   applied_preset?: AppliedPreset | null;
   arguments: ArgumentsMap;
   created_at: string;
+  created_by: string;
   id: ActivityDirectiveId;
   last_modified_arguments_at: string;
   last_modified_at: string;
diff --git a/src/utilities/activities.test.ts b/src/utilities/activities.test.ts
index d6f036b88e..48b23b2474 100644
--- a/src/utilities/activities.test.ts
+++ b/src/utilities/activities.test.ts
@@ -104,6 +104,7 @@ describe('sortActivityDirectivesOrSpans', () => {
       applied_preset: null,
       arguments: {},
       created_at: '2022-08-03T18:21:51',
+      created_by: 'admin',
       id: 1,
       last_modified_arguments_at: '2022-08-03T21:53:22',
       last_modified_at: '2022-08-03T21:53:22',
@@ -122,6 +123,7 @@ describe('sortActivityDirectivesOrSpans', () => {
       applied_preset: null,
       arguments: {},
       created_at: '2022-08-03T18:21:51',
+      created_by: 'admin',
       id: 2,
       last_modified_arguments_at: '2022-08-03T21:53:22',
       last_modified_at: '2022-08-03T21:53:22',
@@ -140,6 +142,7 @@ describe('sortActivityDirectivesOrSpans', () => {
       applied_preset: null,
       arguments: {},
       created_at: '2022-08-03T18:21:51',
+      created_by: 'admin',
       id: 3,
       last_modified_arguments_at: '2022-08-03T21:53:22',
       last_modified_at: '2022-08-03T21:53:22',
diff --git a/src/utilities/gql.ts b/src/utilities/gql.ts
index 02d765e8ac..13f7ca8fbf 100644
--- a/src/utilities/gql.ts
+++ b/src/utilities/gql.ts
@@ -1456,6 +1456,7 @@ const gql = {
         }
         arguments
         created_at
+        created_by
         id
         last_modified_arguments_at
         last_modified_at