rework admin handler. fix indentation