fix sometimes getUsername() is null
Merge remote-tracking branch 'origin/master'
remove unneed