[#646] Make username change backwards compatible