Fixed the username dispatching