diff --git a/src/cli/config.js b/src/cli/config.js
index 53bb561df..f9626c70a 100644
--- a/src/cli/config.js
+++ b/src/cli/config.js
@@ -182,10 +182,6 @@ const _addConfigOption = async function (options) {
   });
 
   await updateConfig(options.emailAddress, 'email-address', 'Email:Address', (onSuccess) => {
-    if (options.emailPassword) {
-      logger.info('When changing email address, password must be provided.');
-      return;
-    }
     config.set('Email:Address', options.emailAddress);
     onSuccess();
   });
diff --git a/src/schemas/config.js b/src/schemas/config.js
index 17d5f9018..4814b3b5f 100644
--- a/src/schemas/config.js
+++ b/src/schemas/config.js
@@ -15,25 +15,22 @@ const configUpdate = {
   "id": "/configUpdate",
   "type": "object",
   "properties": {
-    "port": {"type": "integer", "minimum" : 0, "maximum" : 65535},
+    "port": {"type": "integer", "minimum": 0, "maximum": 65535},
     "sslCert": {"type": "string"},
     "sslKey": {"type": "string"},
     "intermediateCert": {"type": "string"},
     "emailActivationOn": {"type": "boolean"},
     "emailActivationOff": {"type": "boolean"},
     "homeUrl": {"type": "string"},
-    "emailAddress": {
-      "type": "string",
-      "pattern": "^(([^<>()\\[\\]\\\\.,;:\\s@\"]+(\\.[^<>()\\[\\]\\\\.,;:\\s@\"]+)*)|(\".+\"))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$"
-    },
+    "emailAddress": {"type": "string"},
     "emailPassword": {"type": "string", "minLength": 1},
     "emailService": {"type": "string"},
     "logDir": {"type": "string"},
     "logSize": {"type": "integer"}
   }
-}
+};
 
-  module.exports = {
+module.exports = {
   mainSchemas: [configUpdate],
   innerSchemas: []
 };