Merge commit 'fe19ba17990219b7c16c6e2397975b39377a5db8'

diff --combined cgilite/users.sh
index f616ca02baca5d07c7199640ab436e064f4d405a,4d7965a57b260f5dc1a50ad4bc3f0411b0c07c0e..4d7965a57b260f5dc1a50ad4bc3f0411b0c07c0e
--- 1/cgilite/users.sh
--- 2/users.sh
+++ b/cgilite/users.sh
@@@ -429,7 -429,7 +429,7 @@@ user_update()
  
          uid="$(POST uid)"
        oldpw="$(POST oldpw)"
-          pw="$(POST pw |grep -xE '.{6}')"
+          pw="$(POST pw |grep -m1 -xE '.{6,}')"
    pwconfirm="$(POST pwconfirm)"
  
  
@@@ -442,7 -442,7 +442,7 @@@
        update_user "${uid}" password="$pw"
        REDIRECT "${_BASE}${PATH_INFO}#UPDATE_SUCCESS"
      else
-       REDIRECT "${_BASE}${PATH_INFO}#ERROR_PWMISMATCH"
+       REDIRECT "${_BASE}${PATH_INFO}#ERROR_PW_MISMATCH"
      fi
    elif [ "$UID_" = "$USER_ID" ]; then
      REDIRECT "${_BASE}${PATH_INFO}#ERROR_INVALID_AUTH_PASSWORD"