diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php
index 506d1e852a..6056753568 100644
--- a/app/xml_cdr/xml_cdr.php
+++ b/app/xml_cdr/xml_cdr.php
@@ -109,14 +109,14 @@ else {
 		echo "	<input type='hidden' name='order_by' value='$order_by'>\n";
 		echo "	<input type='hidden' name='order' value='$order'>\n";
 	}
+	if (permission_exists('xml_cdr_all' && $_REQUEST['showall'] == 'true')) {
+		echo "		<input type='hidden' name='showall' value='true'>\n";
+	}
 	echo "	<table cellpadding='0' cellspacing='0' border='0'>\n";
 	echo "		<tr>\n";
 	echo "			<td style='vertical-align: top;'>\n";
 	if (permission_exists('xml_cdr_all')) {
-		if ($_REQUEST['showall'] == 'true') {
-			echo "		<input type='hidden' name='showall' value='true'>\n";
-		}
-		else {
+		if ($_REQUEST['showall'] != 'true') {
 			echo "		<input type='button' class='btn' value='".$text['button-show_all']."' onclick=\"window.location='xml_cdr.php?showall=true';\">\n";
 		}
 	}
diff --git a/app/xml_cdr/xml_cdr_search.php b/app/xml_cdr/xml_cdr_search.php
index 8b79a0251d..3257848f0d 100644
--- a/app/xml_cdr/xml_cdr_search.php
+++ b/app/xml_cdr/xml_cdr_search.php
@@ -168,7 +168,14 @@ echo "	</tr>";
 if (permission_exists('xml_cdr_all')) {
 	echo "	<tr>";
 	echo "		<td class='vncell'>".$text['button-show_all']."</td>";
-	echo "		<td class='vtable'><input type='checkbox' class='formfld' name='showall' value='true'></td>";
+	echo "		<td class='vtable'>\n";
+	if (permission_exists('xml_cdr_all') && $_REQUEST['showall'] == "true") {
+		echo "			<input type='checkbox' class='formfld' name='showall' checked='checked' value='true'>";
+	}
+	else {
+		echo "			<input type='checkbox' class='formfld' name='showall' value='true'>";
+	}
+	echo "		<td>";
 	echo "	</tr>";
 }
 echo "</table>";
@@ -231,9 +238,6 @@ echo "	</tr>\n";
 
 echo "	<tr>\n";
 echo "		<td colspan='2' align='right'><br>\n";
-if (permission_exists('xml_cdr_all') && $_REQUEST['showall'] == "true") {
-	echo "			<input type='hidden' name='showall' value='".$_REQUEST['showall']."'>\n";
-}
 echo "			<input type='submit' name='submit' class='btn' value='".$text['button-search']."'>\n";
 echo "		</td>\n";
 echo "	</tr>\n";