The repeat check for New Password is performed only when New Password is entered.

This would make the current password less mandatory and allow the email change logic to work.
fix #3193

Author: shibomb

client/utils/reduxFormUtils.js

@@ -51,7 +51,10 @@ export function validateSettings(formProps) {
   if (formProps.newPassword && formProps.newPassword.length < 6) {
     errors.newPassword = i18n.t('ReduxFormUtils.errorShortPassword');
   }
-  if (formProps.currentPassword === formProps.newPassword) {
+  if (
+    formProps.newPassword &&
+    formProps.currentPassword === formProps.newPassword
+  ) {
     errors.newPassword = i18n.t('ReduxFormUtils.errorNewPasswordRepeat');
   }
   return errors;