diff --git a/core/includes/form.inc b/core/includes/form.inc
index f4a7718..dac8fa5 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -1180,6 +1180,10 @@ function password_confirm_validate($element, &$element_state) {
     if (strcmp($pass1, $pass2)) {
       form_error($element, $element_state, t('The specified passwords do not match.'));
     }
+    // Check if password contains at least 6 characters
+    if (strlen($pass1)<6) {
+      form_error($element, $element_state, t('Your password must contain at least 6 characters.'));
+    }
   }
   elseif ($element['#required'] && !empty($element_state['input'])) {
     form_error($element, $element_state, t('Password field is required.'));