fix system-settings and add client validation to deparments