Update to match newest developments in Aquarium.
Email is no longer _id, it's stored under 'username'
Language is correctly called 'locale'