diff --git a/spam/edit_report.cgi b/spam/edit_report.cgi
index 33b39a553..77894e7aa 100755
--- a/spam/edit_report.cgi
+++ b/spam/edit_report.cgi
@@ -31,17 +31,17 @@ else {
 	$subject = &find("subject_tag", $conf);
 	print &ui_table_row($text{'report_subject'},
 		&opt_field("subject_tag", $subject, 15, "*****SPAM*****"));
+	$header = &find("report_header", $conf);
+	# Include report in headers
+	#print &ui_table_row($text{'report_rheader'},
+	#	&yes_no_field("report_header", $header, 0));
+
+	# Terse report mode
+	$terse = &find("use_terse_report", $conf);
+	print &ui_table_row($text{'report_useterse'},
+		&yes_no_field("use_terse_report", $terse, 0));
 	}
 
-# Include report in headers
-$header = &find("report_header", $conf);
-print &ui_table_row($text{'report_rheader'},
-	&yes_no_field("report_header", $header, 0));
-
-# Terse report mode
-$terse = &find("use_terse_report", $conf);
-print &ui_table_row($text{'report_useterse'},
-	&yes_no_field("use_terse_report", $terse, 0));
 
 # Split status header?
 $fold = &find("fold_headers", $conf);
@@ -53,7 +53,7 @@ $detail = &find("detailed_phrase_score", $conf);
 print &ui_table_row($text{'report_detail'},
 	&yes_no_field("detailed_phrase_score", $detail, 0));
 
-if (!&version_atleast(3.0)) {
+if (!&version_atleast(2.6)) {
 	# Include stars header
 	$stars = &find("spam_level_stars", $conf);
 	print &ui_table_row($text{'report_stars'},
@@ -61,6 +61,7 @@ if (!&version_atleast(3.0)) {
 	}
 
 # Character for stars
+# note: has to be replaced in save.cgi with add_header all Level _STARS(.)_ as of 2.6
 $char = &find("spam_level_char", $conf);
 print &ui_table_row($text{'report_char'},
 	&opt_field("spam_level_char", $char, 2, "*"));
@@ -91,16 +92,19 @@ print &ui_table_row($text{'report_report'},
 	&ui_textarea("report", join("\n", @report), 5, 80));
 
 # Extra report to attach to spam messages, for terse mode
-@report = &find_value("terse_report", $conf);
-$clear = &find("clear_terse_report_template", $conf);
-print &ui_table_row($text{'report_terse'},
-	&ui_radio("clear_terse", $clear ? 1 : 0,
-		  [ [ 0, $text{'report_noclear'} ],
-		    [ 1, $text{'report_clear'} ] ])."<br>\n".
-	&ui_textarea("terse", join("\n", @report), 5, 80));
+# note terse report is deprecated in 2.6 and does nothing, will be removed in future
+if (!&version_atleast(2.6)) {
+	@report = &find_value("terse_report", $conf);
+	$clear = &find("clear_terse_report_template", $conf);
+	print &ui_table_row($text{'report_terse'},
+		&ui_radio("clear_terse", $clear ? 1 : 0,
+			  [ [ 0, $text{'report_noclear'} ],
+				[ 1, $text{'report_clear'} ] ])."<br>\n".
+		&ui_textarea("terse", join("\n", @report), 5, 80));
+}
 
 # Additional headers to add
-if (&version_atleast(3)) {
+if (&version_atleast(2.6)) {
 	print &ui_table_hr();
 	$table = &ui_columns_start([ $text{'report_addfor'},
 				  $text{'report_addheader'},
diff --git a/spam/save_report.cgi b/spam/save_report.cgi
index b34f1032c..de3573d5f 100755
--- a/spam/save_report.cgi
+++ b/spam/save_report.cgi
@@ -35,19 +35,17 @@ if (&version_atleast(3.0)) {
 else {
 	&parse_yes_no($conf, "rewrite_subject");
 	&parse_opt($conf, "subject_tag", undef);
+	#&parse_yes_no($conf, "report_header");
+	&parse_yes_no($conf, "use_terse_report");
+	&parse_yes_no($conf, "spam_level_stars");
+	&parse_opt($conf, "spam_level_char", \&char_check);
 	}
-&parse_yes_no($conf, "report_header");
-&parse_yes_no($conf, "use_terse_report");
 &parse_yes_no($conf, "fold_headers");
 &parse_yes_no($conf, "detailed_phrase_score");
-if (!&version_atleast(3.0)) {
-	&parse_yes_no($conf, "spam_level_stars");
-	}
-&parse_opt($conf, "spam_level_char", \&char_check);
 &parse_yes_no($conf, "defang_mime");
 &parse_option($conf, "report_safe") if (defined($in{'report_safe'}));
 
-if (&version_atleast(3)) {
+if (&version_atleast(2.6)) {
 	for($i=0; defined($addfor = $in{"addfor_$i"}); $i++) {
 		next if (!$addfor);
 		$addheader = $in{"addheader_$i"};
@@ -56,6 +54,9 @@ if (&version_atleast(3)) {
 			&error(&text('report_eaddheader', $i+1));
 		push(@adds, "$addfor $addheader $addtext");
 		}
+	if (!in{"spam_level_char_def"} && &char_check($in{"spam_level_char"})) {
+		push(@adds, "all Level _STARS(".$in{ "spam_level_char"} .")_" );
+		}
 	&save_directives($conf, "add_header", \@adds, 1);
 	}
 
diff --git a/update-from-repo.sh b/update-from-repo.sh
index 8092ef845..72092063b 100755
--- a/update-from-repo.sh
+++ b/update-from-repo.sh
@@ -3,7 +3,7 @@
 # Update webmin/usermin to the latest develop version  from GitHub repo
 # inspired by authentic-theme/theme-update.sh script, thanks qooob
 #
-# Version 1.5, 2018-02-12
+# Version 1.5.1, 2018-02-17
 #
 # Kay Marquardt, kay@rrr.de, https://github.com/gandelwartz
 #############################################################################
@@ -221,7 +221,7 @@ fi
 
     ####################
     # start processing pulled source
-    version="`head -c -1 ${TEMP}/version`-`cd ${TEMP}; ${GIT} log -1 --format=%cd --date=format:'%m%d.%H%M'`" 
+    version="`head -c -1 ${TEMP}/version``cd ${TEMP}; ${GIT} log -1 --format=%cd --date=format:'%m%d%H%M'`" 
     DOTVER=`echo ${version} | sed 's/-/./'`
     TARBALL="${TEMP}/tarballs/${PROD}-${DOTVER}"
     ###############
@@ -249,7 +249,7 @@ fi
     do 
         if [[ -f ${TEMP}/${module} && ! -f  "${TARBALL}/$module" ]]; then
           module=`dirname $module`
-          echo "${CYAN}Adding nonstandard${NC} ${ORANGE}$module${NC} to ${PROD^}" && cp -r -L ${TEMP}/${module} ${TARBALL}/
+          echo -e "${CYAN}Adding nonstandard${NC} ${ORANGE}$module${NC} to ${PROD^}" && cp -r -L ${TEMP}/${module} ${TARBALL}/
         fi
     done