Michael's usernameChangeHanlder condition and patch for empty username.