Admin Controller Event fixes