Updated username code