Fixed User.username field logic for different account types.