Remove usage block, fix password length check to match portal