Replaced client and service provider ids with usernames