diff --git a/api/application/controllers/Flyhi_Controller.php b/api/application/controllers/Flyhi_Controller.php
index 5db3ce3d..3f16c3ca 100644
--- a/api/application/controllers/Flyhi_Controller.php
+++ b/api/application/controllers/Flyhi_Controller.php
@@ -312,12 +312,6 @@ class Flyhi_Controller extends REST_Controller {
 							{
 								$product_id = $g_value['answer_value'];
 							}	
-							if($g_value['answer_value'] == 'Residence verification'){
-								$flyhi_pd_type = 4;
-							}
-							if($g_value['answer_value'] == 'Office verification'){
-								$flyhi_pd_type = 3;
-							}
 
 							if(isset($g_value['question_key']) && $g_value['question_key'] == 'verification_type')
 							{
@@ -337,10 +331,7 @@ class Flyhi_Controller extends REST_Controller {
 													$city = $j_value['answer_value'];
 													$flyhi_pd_type = 3;
 												}
-												if($g_value['answer_value'] == 'Office verification' && $j_value['question_key'] == 'employer_business_name')
-												{
-													$applicant_name = $j_value['answer_value'];
-												}
+												
 											}	
 										}
 									}
@@ -1297,6 +1288,12 @@ class Flyhi_Controller extends REST_Controller {
 							{
 								$applicant_name = $g_value['applicant_name'];
 							}	
+							if($g_value['answer_value'] == 'Residence verification'){
+								$flyhi_pd_type = 4;
+							}
+							if($g_value['answer_value'] == 'Office verification'){
+								$flyhi_pd_type = 3;
+							}
 							if(isset($g_value['question_key']) && $g_value['question_key'] == 'verification_type')
 							{
 								if(isset($g_value['onchange_properties']))
@@ -1309,11 +1306,9 @@ class Flyhi_Controller extends REST_Controller {
 											{
 												if($g_value['answer_value'] == 'Residence verification' && $j_value['question_key'] == 'residence_city'){
 													$city = $j_value['answer_value'];
-													$flyhi_pd_type = 4;
 												}
 												if($g_value['answer_value'] == 'Office verification' && $j_value['question_key'] == 'officer_city'){
 													$city = $j_value['answer_value'];
-													$flyhi_pd_type = 3;
 												}
 											}	
 										}