Username fix

This is for the issue #3679.