Switch to organisation picker for mcp-1.5