Login flow adjusts
Merge branch 'develop_implementation'