Hackery to make template upgrade and profile edits save