Admin user edit - role assignment
various fixes