Move some commonalities between the login/signup helpers into a separate trait
Merge branch 'master' into virtual_collection_rework