diff --git a/src/UDS.Net.API/Extensions/DtoToEntityMapper.cs b/src/UDS.Net.API/Extensions/DtoToEntityMapper.cs
index f37ee00..4313b53 100644
--- a/src/UDS.Net.API/Extensions/DtoToEntityMapper.cs
+++ b/src/UDS.Net.API/Extensions/DtoToEntityMapper.cs
@@ -16,6 +16,11 @@ private static void SetBaseProperties(this Form entity, FormDto dto)
             entity.IsDeleted = dto.IsDeleted;
             entity.Status = dto.Status;
 
+            if (dto.INITIALS == null)
+                entity.INITIALS = string.Empty; // INITIALS can't be null, so use empty string
+            else
+                entity.INITIALS = dto.INITIALS;
+
             if (dto.FRMDATE > DateTime.MinValue)
                 entity.FRMDATE = dto.FRMDATE;
             else
diff --git a/src/UDS.Net.API/Extensions/EntityToDtoMapper.cs b/src/UDS.Net.API/Extensions/EntityToDtoMapper.cs
index f05cb57..8676710 100644
--- a/src/UDS.Net.API/Extensions/EntityToDtoMapper.cs
+++ b/src/UDS.Net.API/Extensions/EntityToDtoMapper.cs
@@ -24,6 +24,7 @@ private static VisitDto ConvertVisitToDto(Visit visit)
                 PACKET = visit.PACKET,
                 FORMVER = visit.FORMVER,
                 VISIT_DATE = visit.VISIT_DATE,
+                INITIALS = visit.INITIALS,
                 Forms = new List<FormDto>()
             };