Changing if structure for client_message requests.