Fixed admin conflict issue