diff --git a/frontend/src/components/FieldLayout.vue b/frontend/src/components/FieldLayout.vue
index e3e581c0..680e80e4 100644
--- a/frontend/src/components/FieldLayout.vue
+++ b/frontend/src/components/FieldLayout.vue
@@ -151,7 +151,10 @@
                     <Link
                       v-else-if="field.fieldtype === 'User'"
                       class="form-control"
-                      :value="getUser(data[field.fieldname]).full_name"
+                      :value="
+                        data[field.fieldname] &&
+                        getUser(data[field.fieldname]).full_name
+                      "
                       :doctype="field.options"
                       :filters="field.filters"
                       @change="(v) => (data[field.fieldname] = v)"
@@ -160,6 +163,7 @@
                     >
                       <template #prefix>
                         <UserAvatar
+                          v-if="data[field.fieldname]"
                           class="mr-2"
                           :user="data[field.fieldname]"
                           size="sm"
diff --git a/frontend/src/components/SidePanelLayout.vue b/frontend/src/components/SidePanelLayout.vue
index 4e42f54a..d13ce621 100644
--- a/frontend/src/components/SidePanelLayout.vue
+++ b/frontend/src/components/SidePanelLayout.vue
@@ -74,7 +74,7 @@
                               field.mandatory_via_depends_on)
                           "
                           class="text-ink-red-3"
-                          >*</span
+                          > *</span
                         >
                       </div>
                     </Tooltip>