Reset password for non admin now requires old password match