Fixed issue with client name not being set correctly