Optimize login call for already logged in users
Merge branch 'hotfix/first-release-hotfix'