Add WSClient initial user fetching logic