WIP - Fixing issue with login redirect