avoid array allocation when extracting usernames and passwords
fix bad merge