Allow username without password after all.
Merge bug25985 (again)