diff --git a/src/CAREUI/display/RecordMeta.tsx b/src/CAREUI/display/RecordMeta.tsx
index 944ddf27c8f..818553d9207 100644
--- a/src/CAREUI/display/RecordMeta.tsx
+++ b/src/CAREUI/display/RecordMeta.tsx
@@ -11,6 +11,7 @@ interface Props {
   time?: string;
   prefix?: ReactNode;
   className?: string;
+  inlineClassName?: string;
   user?: {
     first_name: string;
     last_name: string;
@@ -23,7 +24,14 @@ interface Props {
  * A generic component to display relative time along with a tooltip and a user
  * if provided.
  */
-const RecordMeta = ({ time, user, prefix, className, inlineUser }: Props) => {
+const RecordMeta = ({
+  time,
+  user,
+  prefix,
+  className,
+  inlineClassName,
+  inlineUser,
+}: Props) => {
   const isOnline = user && isUserOnline(user);
 
   let child = (
@@ -47,11 +55,11 @@ const RecordMeta = ({ time, user, prefix, className, inlineUser }: Props) => {
 
   if (prefix || user) {
     child = (
-      <div className="flex items-center gap-1">
+      <div className={`flex items-center gap-1 ${inlineClassName}`}>
         {prefix}
         {child}
         {user && inlineUser && <span>by</span>}
-        {user && <CareIcon className="care-l-user" />}
+        {user && !inlineUser && <CareIcon className="care-l-user" />}
         {user && inlineUser && (
           <span className="font-medium">{formatName(user)}</span>
         )}
diff --git a/src/Components/Shifting/ShiftDetails.tsx b/src/Components/Shifting/ShiftDetails.tsx
index 3d2a1f60b8b..a898b0cde15 100644
--- a/src/Components/Shifting/ShiftDetails.tsx
+++ b/src/Components/Shifting/ShiftDetails.tsx
@@ -806,13 +806,12 @@ export default function ShiftDetails(props: { id: string }) {
                     {t("created")}
                   </div>
                   <div className="mt-1 whitespace-pre text-sm leading-5 text-gray-900">
-                    <div className="text-sm">
-                      {data?.created_by_object?.first_name}
-                      {data?.created_by_object?.last_name}
-                    </div>
-                    <div className="text-xs">
-                      {data?.created_date && formatDateTime(data?.created_date)}
-                    </div>
+                    <RecordMeta
+                      time={data?.created_date}
+                      user={data?.created_by_object}
+                      inlineUser={true}
+                      inlineClassName={"flex-wrap justify-center"}
+                    />
                   </div>
                 </div>
                 <div className="mt-2 lg:mt-0">
@@ -820,14 +819,12 @@ export default function ShiftDetails(props: { id: string }) {
                     {t("last_edited")}
                   </div>
                   <div className="mt-1 whitespace-pre text-sm leading-5 text-gray-900">
-                    <div className="text-sm">
-                      {data?.last_edited_by_object?.first_name}{" "}
-                      {data?.last_edited_by_object?.last_name}
-                    </div>
-                    <div className="text-xs">
-                      {data?.modified_date &&
-                        formatDateTime(data?.modified_date)}
-                    </div>
+                    <RecordMeta
+                      time={data?.modified_date}
+                      user={data?.last_edited_by_object}
+                      inlineUser={true}
+                      inlineClassName={"flex-wrap justify-center"}
+                    />
                   </div>
                 </div>
               </div>