Updated to reference the username directly rather then going through get_username. This is because some may be using an email address as the username, which doesn't work with many cases