Better admin settings

@EamonNerbonne