Fixing auth token problem