Make Synchronous & Asynchronous clients work correctly for 'forms'