Don't forget data when editing a core account, fixes BRs #325 and #328