diff --git a/grade/edit/tree/category.php b/grade/edit/tree/category.php
index 5f29f06..f7db0de 100644
--- a/grade/edit/tree/category.php
+++ b/grade/edit/tree/category.php
@@ -72,6 +72,11 @@ if ($id) {
     $grade_category->apply_forced_settings();
 
     $category = $grade_category->get_record_data();
+
+    $grade_item = new grade_item(array('courseid'=>$courseid, 'itemtype'=>'manual'), false);
+    foreach ($grade_item->get_record_data() as $key => $value) {
+        $category->{"grade_item_$key"} = $value;
+    }
 }
 
 $mform = new edit_category_form(null, array('current'=>$category, 'gpr'=>$gpr));
diff --git a/grade/edit/tree/category_form.php b/grade/edit/tree/category_form.php
index 4653ad4..bded7bd 100644
--- a/grade/edit/tree/category_form.php
+++ b/grade/edit/tree/category_form.php
@@ -148,7 +148,6 @@ class edit_category_form extends moodleform {
             }
         }
 
-
         $mform->addElement('select', 'grade_item_scaleid', get_string('scale'), $options);
         $mform->setHelpButton('grade_item_scaleid', array('scaleid', get_string('scaleid', 'grades'), 'grade'), true);
         $mform->disabledIf('grade_item_scaleid', 'grade_item_gradetype', 'noteq', GRADE_TYPE_SCALE);
@@ -466,6 +465,14 @@ class edit_category_form extends moodleform {
             }
         }
 
+        if (array_key_exists('grade_item_grademin', $data) and array_key_exists('grade_item_grademax', $data)) {
+            if ($data['grade_item_grademax'] == $data['grade_item_grademin'] or
+                $data['grade_item_grademax'] < $data['grade_item_grademin']) {
+                $errors['grade_item_grademin'] = get_string('incorrectminmax', 'grades');
+                $errors['grade_item_grademax'] = get_string('incorrectminmax', 'grades');
+            }
+        }
+
         return $errors;
     }
 }