WIP - fixes #3272 - allow 'admin' account to be removed and replaced