diff --git a/app/Controller/AttributesController.php b/app/Controller/AttributesController.php
index d77d5c634..330208cd5 100755
--- a/app/Controller/AttributesController.php
+++ b/app/Controller/AttributesController.php
@@ -265,7 +265,7 @@ class AttributesController extends AppController {
 		$this->viewClass = 'Media';
 		$params = array(
 					'id'		=> $file,
-					'name'		=> $filename,
+					'name'		=> $filename.".".$fileExt,
 					'extension' => $fileExt,
 					'download'	=> true,
 					'path'		=> $path
@@ -419,7 +419,7 @@ class AttributesController extends AppController {
 		// combobox for distribution
 		$this->set('distributionDescriptions', $this->Attribute->distributionDescriptions);
 		$this->set('distributionLevels', $this->Event->distributionLevels);
-		$events = $this->Event->findById($eventId);
+		$events = $this->Event->findById($eventId);
 		$this->set('currentDist', $events['Event']['distribution']);
 	}