diff --git a/application/controllers/Sales.php b/application/controllers/Sales.php
index 4b6cf3dde..d8c80b5b4 100644
--- a/application/controllers/Sales.php
+++ b/application/controllers/Sales.php
@@ -607,7 +607,7 @@ class Sales extends Secure_Controller
 		$data['show_stock_locations'] = $this->Stock_location->show_locations('sales');
 		$data['amount_change'] = $this->sale_lib->get_amount_due() * -1;
 		$data['amount_due'] = $this->sale_lib->get_amount_due();
-		$employee_info = $this->Employee->get_info($this->Employee->get_logged_in_employee_info()->person_id);
+		$employee_info = $this->Employee->get_info($this->sale_lib->get_employee());
 		$data['employee'] = $employee_info->first_name . ' ' . $employee_info->last_name;
 		$this->_load_customer_data($this->sale_lib->get_customer(), $data);
 
diff --git a/application/libraries/Sale_lib.php b/application/libraries/Sale_lib.php
index 54c8224b1..8d212ba5d 100644
--- a/application/libraries/Sale_lib.php
+++ b/application/libraries/Sale_lib.php
@@ -214,6 +214,26 @@ class Sale_lib
 	{
 		$this->CI->session->unset_userdata('sales_customer');
 	}
+	
+	public function get_employee()
+	{
+		if(!$this->CI->session->userdata('sales_employee'))
+		{
+			$this->set_employee(-1);
+		}
+
+		return $this->CI->session->userdata('sales_employee');
+	}
+
+	public function set_employee($employee_id)
+	{
+		$this->CI->session->set_userdata('sales_employee', $employee_id);
+	}
+
+	public function remove_employee()
+	{
+		$this->CI->session->unset_userdata('sales_employee');
+	}
 
 	public function get_mode()
 	{
@@ -487,6 +507,7 @@ class Sale_lib
 		}
 
 		$this->set_customer($this->CI->Sale->get_customer($sale_id)->person_id);
+		$this->set_employee($this->CI->Sale->get_employee($sale_id)->person_id);
 	}
 	
 	public function copy_entire_suspended_sale($sale_id)
diff --git a/application/models/Sale.php b/application/models/Sale.php
index af1419ad8..3bcbdf603 100644
--- a/application/models/Sale.php
+++ b/application/models/Sale.php
@@ -648,6 +648,14 @@ class Sale extends CI_Model
 		return $this->Customer->get_info($this->db->get()->row()->customer_id);
 	}
 
+	public function get_employee($sale_id)
+	{
+		$this->db->from('sales');
+		$this->db->where('sale_id', $sale_id);
+
+		return $this->Employee->get_info($this->db->get()->row()->employee_id);
+	}
+
 	public function check_invoice_number_exists($invoice_number, $sale_id = '')
 	{
 		$this->db->from('sales');