fix the administrator form and messages