Ensure that username is properly cleared when needed
Ensure that username is properly set when needed