Refactor for usernames injected