Tidied up the user maintenance.
Added admin flag to users
Allow editing of admin