diff --git a/Application/EdFi.Ods.AdminApp.Web/Infrastructure/AutoMapper/AdminWebMappingProfile.cs b/Application/EdFi.Ods.AdminApp.Web/Infrastructure/AutoMapper/AdminWebMappingProfile.cs
index 4942819c..b2aa7137 100644
--- a/Application/EdFi.Ods.AdminApp.Web/Infrastructure/AutoMapper/AdminWebMappingProfile.cs
+++ b/Application/EdFi.Ods.AdminApp.Web/Infrastructure/AutoMapper/AdminWebMappingProfile.cs
@@ -69,13 +69,19 @@ public AdminWebMappingProfile()
                 .ForMember(dst => dst.LocalEducationAgencyId, opt => opt.Ignore());
 
             CreateMap<AddSchoolModel, School>()
-                .ForMember(dst => dst.Id, opt => opt.Ignore())
+                .ForMember(dst => dst.Id, opt => opt.Ignore())
+                .ForMember(dst => dst.StreetNumberName, opt => opt.MapFrom(src => src.StreetNumberName.Trim()))
+                .ForMember(dst => dst.City, opt => opt.MapFrom(src => src.City.Trim()))
+                .ForMember(dst => dst.ZipCode, opt => opt.MapFrom(src => src.ZipCode.Trim()))
                 .ForMember(dst => dst.EducationOrganizationId, opt => opt.MapFrom(src => src.SchoolId))
                 .ForMember(dst => dst.EducationOrganizationCategory, opt => opt.MapFrom(src => EducationOrganizationTypes.Instance.SchoolType));
 
             CreateMap<AddPsiSchoolModel, PsiSchool>()
                 .ForMember(dst => dst.Id, opt => opt.Ignore())
-                .ForMember(dst => dst.EducationOrganizationId, opt => opt.MapFrom(src => src.SchoolId))
+                .ForMember(dst => dst.EducationOrganizationId, opt => opt.MapFrom(src => src.SchoolId))
+                .ForMember(dst => dst.StreetNumberName, opt => opt.MapFrom(src => src.StreetNumberName.Trim()))
+                .ForMember(dst => dst.City, opt => opt.MapFrom(src => src.City.Trim()))
+                .ForMember(dst => dst.ZipCode, opt => opt.MapFrom(src => src.ZipCode.Trim()))
                 .ForMember(dst => dst.EducationOrganizationCategory, opt => opt.MapFrom(src => EducationOrganizationTypes.Instance.SchoolType))
                 .ForMember(dst => dst.ImprovingSchool, opt => opt.Ignore());
 
@@ -109,7 +115,10 @@ public AdminWebMappingProfile()
                 .ForMember(dst => dst.StateOptions, opt => opt.Ignore());
 
             CreateMap<EditSchoolModel, School>()
-                .ForMember(dst => dst.EducationOrganizationId, opt => opt.MapFrom(src => src.SchoolId))
+                .ForMember(dst => dst.EducationOrganizationId, opt => opt.MapFrom(src => src.SchoolId))
+                .ForMember(dst => dst.StreetNumberName, opt => opt.MapFrom(src => src.StreetNumberName.Trim()))
+                .ForMember(dst => dst.City, opt => opt.MapFrom(src => src.City.Trim()))
+                .ForMember(dst => dst.ZipCode, opt => opt.MapFrom(src => src.ZipCode.Trim()))
                 .ForMember(dst => dst.EducationOrganizationCategory, opt => opt.MapFrom(src => EducationOrganizationTypes.Instance.SchoolType));
 
             CreateMap<PsiSchool, EditPsiSchoolModel>()
@@ -120,7 +129,10 @@ public AdminWebMappingProfile()
                 .ForMember(dst => dst.FederalLocaleCodeOptions, opt => opt.Ignore());
 
             CreateMap<EditPsiSchoolModel, PsiSchool>()
-                .ForMember(dst => dst.EducationOrganizationId, opt => opt.MapFrom(src => src.SchoolId))
+                .ForMember(dst => dst.EducationOrganizationId, opt => opt.MapFrom(src => src.SchoolId))
+                .ForMember(dst => dst.StreetNumberName, opt => opt.MapFrom(src => src.StreetNumberName.Trim()))
+                .ForMember(dst => dst.City, opt => opt.MapFrom(src => src.City.Trim()))
+                .ForMember(dst => dst.ZipCode, opt => opt.MapFrom(src => src.ZipCode.Trim()))
                 .ForMember(dst => dst.EducationOrganizationCategory, opt => opt.MapFrom(src => EducationOrganizationTypes.Instance.SchoolType))
                 .ForMember(dst => dst.ImprovingSchool, opt => opt.Ignore())
                 .ForMember(dst => dst.LocalEducationAgencyId, opt => opt.Ignore());