diff --git a/controllers/invoices_controller.php b/controllers/invoices_controller.php
index ebfe7b7e..8cea9c63 100644
--- a/controllers/invoices_controller.php
+++ b/controllers/invoices_controller.php
@@ -81,11 +81,14 @@ class InvoicesController extends AppController {
             }
         }
         if (empty($this->data)) {
-            $this->data = $this->Invoice->read(null, $id);
+            $invoice = $this->Invoice->read(null, $id);
+            $this->data = $invoice;
+
         }
-        $enquiries = $this->Invoice->Enquiry->find('list');
+        
         $users = $this->Invoice->User->find('list');
-        $this->set(compact('enquiries','users'));
+        $jobs = $this->Invoice->Job->find('list', array('conditions'=>array('Job.enquiry_id'=>$invoice['Invoice']['enquiry_id'])));
+        $this->set(compact('users', 'jobs'));
     }
 
     function delete($id = null) {
diff --git a/views/invoices/edit.ctp b/views/invoices/edit.ctp
index 6fa995f1..8b8af612 100644
--- a/views/invoices/edit.ctp
+++ b/views/invoices/edit.ctp
@@ -9,7 +9,8 @@
 		echo $form->input('title');
 		echo $form->input('paid');
 		echo $form->input('payment_received_date');
-		echo $form->input('enquiry_id');
+		echo $form->input('enquiry_id', array('type'=>'hidden'));
+                echo $form->input('job_id');
 		echo $form->input('user_id');
 	?>
 	</fieldset>