Fixed previous merge issue, moved the current usergetter to usernamegetter to specify the difference between the two.