Fixed username problem