Make the login process more granular with defers
Merge remote-tracking branch 'chiiph/feature/granular_login' into develop
pep8