diff --git a/README.md b/README.md
index baf9ef1..81002e1 100644
--- a/README.md
+++ b/README.md
@@ -87,6 +87,7 @@ At first it's recommend to discuss your feature request with the Cacti community
 * removed: Support of php_rrdtool extension
 * removed: Support of RRDtool server
 * removed: Support of Graidle
+* issue#41: When creating a new Report Template, save fails and loses all data
 
 --- 1.0.1 ---
 * issue#2: Suppress display of 'Constant MAX_DISPLAY_PAGES is already defined'
diff --git a/include/global_forms.php b/include/global_forms.php
index 67be6fb..df73a09 100644
--- a/include/global_forms.php
+++ b/include/global_forms.php
@@ -58,6 +58,7 @@
 		'method' => 'checkbox',
 		'description' => __('The status "locked" avoids any kind of modification to your report template as well as assigned measurands and variable definitions', 'reportit'),
 		'value' => '|arg1:locked|',
+		'default' => 'on',
 	),
 	'template_filter' => array(
 		'friendly_name' => __('Additional Pre-filter', 'reportit'),
diff --git a/templates.php b/templates.php
index aed9f75..fc36db8 100644
--- a/templates.php
+++ b/templates.php
@@ -670,7 +670,7 @@ function form_save() {
 		}
 	}
 
-	/* check if we can unlock this template. */
+	/* check if we can lock this template. */
 	if ($template_data['locked'] == '') {
 		if (stat_autolock_template($template_data['id'])) {
 			raise_message('reportit_templates__3');