diff --git a/packages/server/src/modules/Organization/Organization.constants.ts b/packages/server/src/modules/Organization/Organization.constants.ts
index a1c0bd6f7..e3252fa58 100644
--- a/packages/server/src/modules/Organization/Organization.constants.ts
+++ b/packages/server/src/modules/Organization/Organization.constants.ts
@@ -1,18 +1,15 @@
 import currencies from 'js-money/lib/currency';
 
 export const DATE_FORMATS = [
-  'MM.dd.yy',
-  'dd.MM.yy',
-  'yy.MM.dd',
-  'MM.dd.yyyy',
-  'dd.MM.yyyy',
-  'yyyy.MM.dd',
-  'MM/DD/YYYY',
-  'M/D/YYYY',
-  'dd MMM YYYY',
-  'dd MMMM YYYY',
-  'MMMM dd, YYYY',
-  'EEE, MMMM dd, YYYY',
+  'MM/DD/YY',
+  'DD/MM/YY',
+  'YY/MM/DD',
+  'MM/DD/yyyy',
+  'DD/MM/yyyy',
+  'yyyy/MM/DD',
+  'DD MMM YYYY',
+  'DD MMMM YYYY',
+  'MMMM DD, YYYY',
 ];
 export const MONTHS = [
   'january',
diff --git a/packages/server/src/modules/Organization/Organization.utils.ts b/packages/server/src/modules/Organization/Organization.utils.ts
index 780318a08..1e2469fd2 100644
--- a/packages/server/src/modules/Organization/Organization.utils.ts
+++ b/packages/server/src/modules/Organization/Organization.utils.ts
@@ -12,6 +12,6 @@ export const transformBuildDto = (
 ): BuildOrganizationDto => {
   return {
     ...buildDTO,
-    dateFormat: defaultTo(buildDTO.dateFormat, 'DD MMM yyyy'),
+    dateFormat: defaultTo(buildDTO.dateFormat, 'DD MMM YYYY'),
   };
 };
diff --git a/packages/webapp/src/containers/Preferences/General/GeneralForm.tsx b/packages/webapp/src/containers/Preferences/General/GeneralForm.tsx
index 3caecb50c..f31872534 100644
--- a/packages/webapp/src/containers/Preferences/General/GeneralForm.tsx
+++ b/packages/webapp/src/containers/Preferences/General/GeneralForm.tsx
@@ -111,12 +111,12 @@ export default function PreferencesGeneralForm({ isSubmitting }) {
       >
         <Stack>
           <FInputGroup
-            name={'address.address_1'}
+            name={'address.address1'}
             placeholder={'Address 1'}
             fastField
           />
           <FInputGroup
-            name={'address.address_2'}
+            name={'address.address2'}
             placeholder={'Address 2'}
             fastField
           />