diff --git a/client/utils/reduxFormUtils.js b/client/utils/reduxFormUtils.js
index 06776e0d..8ff4b0a9 100644
--- a/client/utils/reduxFormUtils.js
+++ b/client/utils/reduxFormUtils.js
@@ -44,7 +44,9 @@ export function validateSettings(formProps) {
   if (formProps.currentPassword && !formProps.newPassword) {
     errors.newPassword = 'Please enter a new password or leave the current password empty.';
   }
-
+  if (formProps.newPassword && formProps.newPassword.length < 6) {
+    errors.newPassword = 'Password must be at least 6 characters';
+  }
   return errors;
 }
 
@@ -67,10 +69,8 @@ export function validateSignup(formProps) {
   if (!formProps.password) {
     errors.password = 'Please enter a password';
   }
-  if (formProps.password) {
-    if (formProps.password.length < 6) {
-      errors.password = 'Password must be at least 6 characters';
-    }
+  if (formProps.password && formProps.password.length < 6) {
+    errors.password = 'Password must be at least 6 characters';
   }
   if (!formProps.confirmPassword) {
     errors.confirmPassword = 'Please enter a password confirmation';