Keep 'username' around in the content-type tables. For now at least. Hopefully fixes #766.