fix admin create another admin without entity
fix edit admin with another admin
Merge remote-tracking branch 'origin/5252_entity_filter'