diff --git a/app/Controller/AttributesController.php b/app/Controller/AttributesController.php
index 7ca273bc4..593034ba7 100755
--- a/app/Controller/AttributesController.php
+++ b/app/Controller/AttributesController.php
@@ -1854,8 +1854,8 @@ class AttributesController extends AppController {
 		if ($eventId) $file .= 'event-' . $eventId . '.';
 		if ($from) $file .= 'from-' . $from . '.';
 		if ($to) $file .= 'to-' . $to . '.';
-		if ($file == '') $file = 'all';
-		$this->header('Content-Disposition: download; filename="misp.rpz.' . $file . '.txt"');
+		if ($file == '') $file = 'all.';
+		$this->header('Content-Disposition: download; filename="misp.rpz.' . $file . 'txt"');
 		$this->layout = 'text/default';
 		$this->loadModel('Whitelist');
 		$values = $this->Whitelist->removeWhitelistedValuesFromArray($values);
diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index eac279958..294658fe7 100755
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -3167,7 +3167,7 @@ class EventsController extends AppController {
 					'checkbox_set' => '/true'
 			),
 			'rpz' => array(
-					'url' => '/attributes/rpz/download',
+					'url' => '/attributes/rpz/download/false/' . $id,
 					'text' => 'RPZ Zone file',
 					'requiresPublished' => true,
 					'checkbox' => false,