diff --git a/airtime_mvc/application/forms/EditAudioMD.php b/airtime_mvc/application/forms/EditAudioMD.php
index 6a9a8e2e0..107c23d53 100644
--- a/airtime_mvc/application/forms/EditAudioMD.php
+++ b/airtime_mvc/application/forms/EditAudioMD.php
@@ -87,6 +87,13 @@ class Application_Form_EditAudioMD extends Zend_Form
             'class'      => 'input_text',
             'filters'    => array('StringTrim')
         ));
+        
+        // Add conductor field
+        $this->addElement('text', 'conductor', array(
+            'label'      => 'Conductor:',
+            'class'      => 'input_text',
+            'filters'    => array('StringTrim')
+        ));
 
 		// Add mood field
         $this->addElement('text', 'mood', array(
diff --git a/airtime_mvc/application/views/scripts/library/get-file-meta-data.ajax.phtml b/airtime_mvc/application/views/scripts/library/get-file-meta-data.ajax.phtml
index 77fcdf933..4e0caf69d 100644
--- a/airtime_mvc/application/views/scripts/library/get-file-meta-data.ajax.phtml
+++ b/airtime_mvc/application/views/scripts/library/get-file-meta-data.ajax.phtml
@@ -1,6 +1,6 @@
 <?php if($this->type == "audioclip") : ?>
 <div><span>Title:</span><span><?php echo ($this->md["MDATA_KEY_TITLE"]);?></span></div>
-<div><span>Artist:</span><span><?php echo ($this->md["MDATA_KEY_CREATOR"]);?></span></div>
+<div><span>Creator:</span><span><?php echo ($this->md["MDATA_KEY_CREATOR"]);?></span></div>
 <div><span>Album:</span><span><?php echo ($this->md["MDATA_KEY_SOURCE"]);?></span></div>
 <div><span>Track:</span><span><?php echo ($this->md["MDATA_KEY_TRACKNUMBER"]);?></span></div>
 <div><span>Length:</span><span><?php echo ($this->md["MDATA_KEY_DURATION"]);?></span></div>
@@ -11,6 +11,7 @@
 <div><span>Year:</span><span><?php echo ($this->md["MDATA_KEY_YEAR"]);?></span></div>
 <div><span>Label:</span><span><?php echo ($this->md["MDATA_KEY_LABEL"]);?></span></div>
 <div><span>BPM:</span><span><?php echo ($this->md["MDATA_KEY_BPM"]);?></span></div>
+<div><span>Composer:</span><span><?php echo ($this->md["MDATA_KEY_COMPOSER"]);?></span></div>
 <div><span>Conductor:</span><span><?php echo ($this->md["MDATA_KEY_CONDUCTOR"]);?></span></div>
 <div><span>Copyright:</span><span><?php echo ($this->md["MDATA_KEY_COPYRIGHT"]);?></span></div>
 <div><span>Isrc Number:</span><span><?php echo ($this->md["MDATA_KEY_ISRC"]);?></span></div>