small changes to login process
Merge branch 'setupAuthentication'