[D#631] more updates for edit and different admins