do not accidentally show password as username #7653

Merged
merged 2 commits into from Mar 12, 2017