Change client.* to web.* and accept client and web