diff --git a/app/code/local/Ebizmarts/SagePaySuite/controllers/PaymentController.php b/app/code/local/Ebizmarts/SagePaySuite/controllers/PaymentController.php
index 27838a6..29f49e0 100644
--- a/app/code/local/Ebizmarts/SagePaySuite/controllers/PaymentController.php
+++ b/app/code/local/Ebizmarts/SagePaySuite/controllers/PaymentController.php
@@ -110,6 +110,13 @@ private function _OSCSaveBilling()
 
                         $this->getOnepage()->getQuote()->setData('password_hash', Mage::getModel('customer/customer')->encryptPassword($password));
                     }
+                    //Fix for guest checkout assign firstname and lastname FDT 
+                    else
+                    {
+                        $this->getOnepage()->getQuote()->setData('customer_email', $billing_data['email']);
+                        $this->getOnepage()->getQuote()->setData('customer_firstname', $billing_data['firstname']);
+                        $this->getOnepage()->getQuote()->setData('customer_lastname', $billing_data['lastname']);
+                    }
                 }
 
                 if (!empty($billing_data['customer_password']) && !empty($billing_data['confirm_password'])) {