diff --git a/webif/plugin/sweeper/save.jim b/webif/plugin/sweeper/save.jim
index 7d4a228..423627b 100755
--- a/webif/plugin/sweeper/save.jim
+++ b/webif/plugin/sweeper/save.jim
@@ -34,11 +34,7 @@ if {$dir eq "" || $dir eq $root} {
 	}
 }
 
-set data [string map {
-	& &
-	&lt; <
-	&gt; >
-} [cgi_get data "-"]]
+set data [cgi_unquote_html [cgi_get data "-"]]
 
 if {$data eq "-" || $data eq ""} {
 	if {[file exists $cf]} { file delete $cf }
diff --git a/webif/plugin/sweeper/test.jim b/webif/plugin/sweeper/test.jim
index 882a2b5..061e2bc 100755
--- a/webif/plugin/sweeper/test.jim
+++ b/webif/plugin/sweeper/test.jim
@@ -10,11 +10,7 @@ set dryrun [cgi_get dryrun 1]
 
 set cf "/tmp/sweepertest.cf"
 
-set data [string map {
-	&amp; &
-	&lt; <
-	&gt; >
-} [cgi_get data "-"]]
+set data [cgi_unquote_html [cgi_get data "-"]]
 
 if {$data eq "-" || $data eq ""} {
 	puts "No data sent!"