rework contact service around usernames