updates for admin

in response to jira es-667