TOOLS-123 fix for auth errors