Fix issue #441 - Missing or mal-formatted username