Bug 850904 - Fix account deletion so that nothing gets saved after deletion occurs

r? @asutherland: Could you take a quick look at this to make sure there's nothing awry? I'm getting newline weirdness again...