Bug 1020406 - Refactor login to expose multiple models if needed