Should define the username only if empty
Merge pull request #2334 from sylvainkalache/master

Username being overrided