Revert "Remove unneeded usage blocks, fix password length check to match portal"

This reverts commit 9b110ba3f111cbe684856d11316ce60a40536166.