Account and safety

These controls are awaiting database validation in the local preview.