fix bug 753563 - Support username changes

@groovecoder as mentioned on IRC I disagree with this being a problem that we should fix by further solidifying a technical debt in a new feature, let's fix the new bug as part of the PR