fixed multiple admin issue MJ-394