add username to users
Add replies to @username