added @ to all usernames