Refactor login collection.
Fix static wait.
Merge branch 'logins'