This should finally fix login redirect