Changes in addclient workflow