fix bug 753563 - Support username changes

Good point. So, we'll fold the fix for https://bugzilla.mozilla.org/show_bug.cgi?id=1090241 into this PR too.