Refactor username problem