diff --git a/package-lock.json b/package-lock.json
index 100ac392f8..daf252c8ae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1588,12 +1588,12 @@
       }
     },
     "@types/react-datepicker": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/@types/react-datepicker/-/react-datepicker-2.8.1.tgz",
-      "integrity": "sha512-N6jCCRufj3TwN33beCf6/hdR0CVxGY0uZpqm+3EFbbdZ5rYTHzfz3kFSQzXOq87yNCYp8yTwyvot0jfCC34jxg==",
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/@types/react-datepicker/-/react-datepicker-2.9.3.tgz",
+      "integrity": "sha512-87L4+bQ1FwAmlb+6bMaXVMKFdVvH0u7Zib0x4kOPRqAb0qfrQuaWOlLYvd/yETYhCFuHuQEA46kasyU6PpH3+A==",
       "requires": {
         "@types/react": "*",
-        "date-fns": "^2.0.0-beta.1",
+        "date-fns": "^2.0.1",
         "popper.js": "^1.14.1"
       }
     },
@@ -5099,12 +5099,12 @@
       }
     },
     "create-react-context": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.2.3.tgz",
-      "integrity": "sha512-CQBmD0+QGgTaxDL3OX1IDXYqjkp2It4RIbcb99jS6AEg27Ga+a9G3JtK6SIu0HBwPLZlmwt9F7UwWA4Bn92Rag==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.3.0.tgz",
+      "integrity": "sha512-dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw==",
       "requires": {
-        "fbjs": "^0.8.0",
-        "gud": "^1.0.0"
+        "gud": "^1.0.0",
+        "warning": "^4.0.3"
       }
     },
     "credit-card-type": {
@@ -5347,9 +5347,9 @@
       }
     },
     "date-fns": {
-      "version": "2.0.0-beta.4",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.0.0-beta.4.tgz",
-      "integrity": "sha512-xekjYm7ZDBuzePM/GBodhi3hW3P8dd2RbuIOLBjet2E6EGFR82wHTTXCSGuDEoapqlDvsx88ymRsq85lbM7dDw=="
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.6.0.tgz",
+      "integrity": "sha512-F55YxqRdEfP/eYQmQjLN798v0AwLjmZ8nMBjdQvNwEE3N/zWVrlkkqT+9seBlPlsbkybG4JmWg3Ee3dIV9BcGQ=="
     },
     "date-now": {
       "version": "0.1.4",
@@ -7269,6 +7269,17 @@
         "react-fast-compare": "^2.0.1",
         "tiny-warning": "^1.0.2",
         "tslib": "^1.9.3"
+      },
+      "dependencies": {
+        "create-react-context": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.2.3.tgz",
+          "integrity": "sha512-CQBmD0+QGgTaxDL3OX1IDXYqjkp2It4RIbcb99jS6AEg27Ga+a9G3JtK6SIu0HBwPLZlmwt9F7UwWA4Bn92Rag==",
+          "requires": {
+            "fbjs": "^0.8.0",
+            "gud": "^1.0.0"
+          }
+        }
       }
     },
     "fragment-cache": {
@@ -13143,15 +13154,35 @@
       }
     },
     "react-datepicker": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-2.8.0.tgz",
-      "integrity": "sha512-TL9YemykqK77hq1LRGIWbLFpHvNfSb8yZr3q1zk5XTGdSLsVtZ6mlXby3zuGwi8sL0+h9SEnNaqK8IeOl0R2iQ==",
+      "version": "2.9.6",
+      "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-2.9.6.tgz",
+      "integrity": "sha512-PLiVhyAr567gWuLMZwIH9WpTIZOZVLhEFyuUzSx3kmQdiikjrYpdNlxsfbbgaxRnee5y08KJZequaqRsNySXmw==",
       "requires": {
-        "classnames": "^2.2.5",
-        "date-fns": "^v2.0.0-beta.1",
-        "prop-types": "^15.6.0",
-        "react-onclickoutside": "^6.7.1",
-        "react-popper": "^1.0.2"
+        "classnames": "^2.2.6",
+        "date-fns": "^2.0.1",
+        "prop-types": "^15.7.2",
+        "react-onclickoutside": "^6.9.0",
+        "react-popper": "^1.3.4"
+      },
+      "dependencies": {
+        "date-fns": {
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.6.0.tgz",
+          "integrity": "sha512-F55YxqRdEfP/eYQmQjLN798v0AwLjmZ8nMBjdQvNwEE3N/zWVrlkkqT+9seBlPlsbkybG4JmWg3Ee3dIV9BcGQ=="
+        },
+        "react-popper": {
+          "version": "1.3.4",
+          "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.4.tgz",
+          "integrity": "sha512-9AcQB29V+WrBKk6X7p0eojd1f25/oJajVdMZkywIoAV6Ag7hzE1Mhyeup2Q1QnvFRtGQFQvtqfhlEoDAPfKAVA==",
+          "requires": {
+            "@babel/runtime": "^7.1.2",
+            "create-react-context": "^0.3.0",
+            "popper.js": "^1.14.4",
+            "prop-types": "^15.6.1",
+            "typed-styles": "^0.0.7",
+            "warning": "^4.0.2"
+          }
+        }
       }
     },
     "react-dom": {
@@ -13203,9 +13234,9 @@
       }
     },
     "react-onclickoutside": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.8.0.tgz",
-      "integrity": "sha512-5Q4Rn7QLEoh7WIe66KFvYIpWJ49GeHoygP1/EtJyZjXKgrWH19Tf0Ty3lWyQzrEEDyLOwUvvmBFSE3dcDdvagA=="
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.9.0.tgz",
+      "integrity": "sha512-8ltIY3bC7oGhj2nPAvWOGi+xGFybPNhJM0V1H8hY/whNcXgmDeaeoCMPPd8VatrpTsUWjb/vGzrmu6SrXVty3A=="
     },
     "react-popper": {
       "version": "1.3.3",
diff --git a/package.json b/package.json
index 72ff0cb663..9731587f14 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "@types/googlemaps": "^3.30.16",
     "@types/lodash": "^4.14.136",
     "@types/react": "^16.8.0",
-    "@types/react-datepicker": "^2.3.0",
+    "@types/react-datepicker": "^2.9.3",
     "@types/react-dom": "^16.8.5",
     "@types/react-modal": "^3.8.0",
     "@types/react-transition-group": "^2.0.15",
@@ -51,13 +51,13 @@
     "credit-card-type": "^8.0.0",
     "dompurify": "^1.0.8",
     "downshift": "^3.2.10",
-    "formik": "^1.5.0",
+    "formik": "^1.5.8",
     "local-storage-fallback": "^4.1.1",
     "lodash": "^4.17.15",
     "object-hash": "^1.3.0",
     "prop-types": "^15.6.2",
     "react": "^16.8.0",
-    "react-datepicker": "^2.7.0",
+    "react-datepicker": "^2.9.6",
     "react-dom": "^16.8.0",
     "react-media": "^1.10.0",
     "react-modal": "^3.8.1",
diff --git a/src/app/address/getAddressValidationSchema.ts b/src/app/address/getAddressValidationSchema.ts
index dd378e09ef..1611c86359 100644
--- a/src/app/address/getAddressValidationSchema.ts
+++ b/src/app/address/getAddressValidationSchema.ts
@@ -64,7 +64,7 @@ export default memoize(function getAddressValidationSchema({
                             // validation when it's optional
                             .strict(true)
                             .nullable(true)
-                            .transform(value => value === '' ? null : value);
+                            .transform((value, originalValue) => originalValue === '' ? null : value);
                     } else if (type === 'integer') {
                         schema[name] = number()
                             // Transform NaN values to undefined to avoid empty string (empty input) to fail number