fixed username change handling