Better admin settings

Gerard (@EamonNerbonne) or Piet (@janpaul123)