More changes. Login loop due to page caching and dev auth restrictions