fixed log in flow
Merge branch 'feat/login' into dev