diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 56044b240..d2538d22c 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -4,6 +4,9 @@
  - Bugfix [ 955397 ] Make Page Printable Macro Fails
  - Bugfix [ 959762 ] Mail Form Template problem (fix)
  - Bugfix [ 952908 ] Manage database option is not available
+ - Bugfix [ 955501 ] Pagination link in SQL Report contains all
+   form-parameters
+ - Bugfix [ 956221 ] article template
 
 
 
diff --git a/lib/WebGUI/Wobject/SQLReport.pm b/lib/WebGUI/Wobject/SQLReport.pm
index 47a174f71..f1c4b91c9 100644
--- a/lib/WebGUI/Wobject/SQLReport.pm
+++ b/lib/WebGUI/Wobject/SQLReport.pm
@@ -118,7 +118,7 @@ sub www_view {
 		if ($query =~ /^select/i || $query =~ /^show/i || $query =~ /^describe/i) {
 			my $url = WebGUI::URL::page('&wid='.$_[0]->get("wobjectId").'&func=view');
 			foreach (keys %{$session{form}}) {
-				unless ($_ eq "pn" || $_ eq "wid" || $_ eq "func") {
+				unless ($_ eq "pn" || $_ eq "wid" || $_ eq "func" || $_ =~ /identifier/i || $_ =~ /password/i) {
 					$url = WebGUI::URL::append($url, WebGUI::URL::escape($_)
 						.'='.WebGUI::URL::escape($session{form}{$_}));
 				}