diff --git a/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java b/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
index 39c582c..79c49a1 100644
--- a/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
+++ b/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
@@ -1732,6 +1732,11 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         setValueIfPresent(form, "Text16_2", getCrAddress2(client));
         setValueIfPresent(form, "fill_2b_1", client.getCrAddressPostalCode());
 
+        if(!(getCrAddress1(client) + getCrAddress2(client)).equals(getCorAddress1(client) + getCorAddress2(client))){
+            setValueIfPresent(form, "address1", getCorAddress1(client));
+            setValueIfPresent(form, "address2", getCorAddress2(client));
+        }        
+
         //setValueIfPresent(form, "address1", commonField.getOthers().get("address1"));
         //setValueIfPresent(form, "address2", commonField.getOthers().get("address2"));
                   
@@ -1938,6 +1943,10 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
                 setValueIfPresent(form2, "Check Box4", "Yes");
             }
         }
+
+        if(!"".equals(getCrAddress1(client) + getCrAddress2(client)) && (getCrAddress1(client) + getCrAddress2(client)).equals(getCorAddress1(client) + getCorAddress2(client))){
+            setValueIfPresent(form2, "Check Box10", "Yes");
+        } 
         
         /* Page1 End */
         
diff --git a/src/main/resources/application-db-local.yml b/src/main/resources/application-db-local.yml
index 7116a02..879df00 100644
--- a/src/main/resources/application-db-local.yml
+++ b/src/main/resources/application-db-local.yml
@@ -1,5 +1,5 @@
 spring:
   datasource:
-    jdbc-url: jdbc:mysql://127.0.0.1:3308/lionerdb?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8
+    jdbc-url: jdbc:mysql://127.0.0.1:3306/lionerdb?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8
     username: root
     password: secret
\ No newline at end of file