Add default username patch (bug #2178)