diff --git a/api/v1/entries/bug.php b/api/v1/entries/bug.php
index 7146d2d879..c05d2d1df8 100644
--- a/api/v1/entries/bug.php
+++ b/api/v1/entries/bug.php
@@ -92,7 +92,7 @@ class bugEntry extends entry
         $oldBug = $this->loadModel('bug')->getByID($bugID);
 
         /* Set $_POST variables. */
-        $fields = 'title,project,execution,openedBuild,assignedTo,pri,severity,type,story,resolvedBy,closedBy,resolution,product,plan,task,module,steps,mailto,keywords';
+        $fields = 'uid,title,project,execution,openedBuild,assignedTo,pri,severity,type,story,resolvedBy,closedBy,resolution,product,plan,task,module,steps,mailto,keywords';
         $this->batchSetPost($fields, $oldBug);
         $this->setPost('notifyEmail', implode(',', $this->request('notifyEmail', array())));
 
diff --git a/module/bug/control.php b/module/bug/control.php
index f9a9c9f320..362638758e 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -925,6 +925,7 @@ class bug extends control
                     }
                 }
                 $files = $this->loadModel('file')->saveUpload('bug', $bugID);
+                if(empty($files) and $this->post->uid != '' and isset($_SESSION['album']['used'][$this->post->uid])) $files = $this->file->getPairs($_SESSION['album']['used'][$this->post->uid]);
             }
             if($this->post->comment != '' or !empty($changes) or !empty($files))
             {