Improved login process on first load, issue #2