Merge "Refactor password validity checking"