diff --git a/application/controllers/RegisterController.php b/application/controllers/RegisterController.php
index e3230e86ca4..d1ac61aaade 100644
--- a/application/controllers/RegisterController.php
+++ b/application/controllers/RegisterController.php
@@ -202,8 +202,8 @@ public function getRegisterSuccess($iSurveyId, $iTokenId)
         $aData['active'] = $oSurvey->active;        
         $aData['iSurveyId'] = $iSurveyId;
         $aData['sLanguage'] = App()->language;
-        $aData['sFirstName'] = $oToken->firstname;
-        $aData['sLastName'] = $oToken->lastname;
+        $aData['sFirstName'] = Yii::app()->request->getPost('register_firstname', '');
+        $aData['sLastName'] = Yii::app()->request->getPost('register_lastname', '');
         $aData['sEmail'] = $oToken->email;
         $aData['thissurvey'] = $oSurvey->attributes;