diff --git a/image/before_member/bn_change_pass.png b/image/before_member/bn_change_pass.png
new file mode 100644
index 00000000..4fb80086
Binary files /dev/null and b/image/before_member/bn_change_pass.png differ
diff --git a/image/before_member/bn_change_pass_en.png b/image/before_member/bn_change_pass_en.png
new file mode 100644
index 00000000..df322178
Binary files /dev/null and b/image/before_member/bn_change_pass_en.png differ
diff --git a/image/before_member/bn_check_coupon.png b/image/before_member/bn_check_coupon.png
new file mode 100644
index 00000000..df32b323
Binary files /dev/null and b/image/before_member/bn_check_coupon.png differ
diff --git a/image/before_member/bn_check_coupon_en.png b/image/before_member/bn_check_coupon_en.png
new file mode 100644
index 00000000..c145db15
Binary files /dev/null and b/image/before_member/bn_check_coupon_en.png differ
diff --git a/image/before_member/bn_topup_credit.png b/image/before_member/bn_topup_credit.png
new file mode 100644
index 00000000..3b561fbd
Binary files /dev/null and b/image/before_member/bn_topup_credit.png differ
diff --git a/image/before_member/bn_topup_credit_en.png b/image/before_member/bn_topup_credit_en.png
new file mode 100644
index 00000000..dac457b5
Binary files /dev/null and b/image/before_member/bn_topup_credit_en.png differ
diff --git a/image/before_member/bp_change_pass.png b/image/before_member/bp_change_pass.png
new file mode 100644
index 00000000..c21c20a4
Binary files /dev/null and b/image/before_member/bp_change_pass.png differ
diff --git a/image/before_member/bp_change_pass_en.png b/image/before_member/bp_change_pass_en.png
new file mode 100644
index 00000000..2fda9d21
Binary files /dev/null and b/image/before_member/bp_change_pass_en.png differ
diff --git a/image/before_member/bp_check_coupon.png b/image/before_member/bp_check_coupon.png
new file mode 100644
index 00000000..7aae232f
Binary files /dev/null and b/image/before_member/bp_check_coupon.png differ
diff --git a/image/before_member/bp_check_coupon_en.png b/image/before_member/bp_check_coupon_en.png
new file mode 100644
index 00000000..5e1b82db
Binary files /dev/null and b/image/before_member/bp_check_coupon_en.png differ
diff --git a/image/before_member/bp_topup_credit.png b/image/before_member/bp_topup_credit.png
new file mode 100644
index 00000000..84f00081
Binary files /dev/null and b/image/before_member/bp_topup_credit.png differ
diff --git a/image/before_member/bp_topup_credit_en.png b/image/before_member/bp_topup_credit_en.png
new file mode 100644
index 00000000..73b97b84
Binary files /dev/null and b/image/before_member/bp_topup_credit_en.png differ
diff --git a/xml/page_before_check_member.xml b/xml/page_before_check_member.xml
index 773e8b76..67b35377 100644
--- a/xml/page_before_check_member.xml
+++ b/xml/page_before_check_member.xml
@@ -9,6 +9,7 @@
 
         Var OpenTopupCredit = 0
         Var OpenCheckCoupon = 0
+        Var ChangeMemberPassword = 0
 
         
         ; Default language (Thai).
@@ -95,12 +96,14 @@
     <Button>
         <X> 286 </X>
         <Y> 824 </Y>
-        <Filename> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bn_topup_credit" + Extension ) </Filename>
-        <FilenamePress> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bp_topup_credit" + Extension ) </FilenamePress>
-        <FilenameDisable> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bp_topup_credit" + Extension ) </FilenameDisable>
+        <Filename> Var( "ROOT/taobin_project/image/before_member/bn_topup_credit" + Extension ) </Filename>
+        <FilenamePress> Var( "ROOT/taobin_project/image/before_member/bp_topup_credit" + Extension ) </FilenamePress>
+        <FilenameDisable> Var( "ROOT/taobin_project/image/before_member/bp_topup_credit" + Extension ) </FilenameDisable>
         <EventClick>
 
             Var OpenTopupCredit = 1
+            Var CheckMemberTitleTH = "กรุณาใส่เบอร์มือถือ\nเพื่อเติมเต่าบินเครดิต"
+            Var CheckMemberTitleEN = "Please enter your mobile number\nto topup Tao bin credit."
             Open "ROOT/taobin_project/xml/page_check_member.xml"
 
         </EventClick>
@@ -109,12 +112,30 @@
     <Button>
         <X> 286 </X>
         <Y> 976 </Y>
-        <Filename> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bn_check_coupon" + Extension ) </Filename>
-        <FilenamePress> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bp_check_coupon" + Extension ) </FilenamePress>
-        <FilenameDisable> Var( "ROOT/taobin_project/image/event/lucky_draw_ads/bp_check_coupon" + Extension ) </FilenameDisable>
+        <Filename> Var( "ROOT/taobin_project/image/before_member/bn_check_coupon" + Extension ) </Filename>
+        <FilenamePress> Var( "ROOT/taobin_project/image/before_member/bp_check_coupon" + Extension ) </FilenamePress>
+        <FilenameDisable> Var( "ROOT/taobin_project/image/before_member/bp_check_coupon" + Extension ) </FilenameDisable>
         <EventClick>
 
             Var OpenCheckCoupon = 1
+            Var CheckMemberTitleTH = "กรุณาใส่เบอร์มือถือ\nเพื่อเช็กคะแนนสะสมของคุณ"
+            Var CheckMemberTitleEN = "Please enter your mobile number\nto check reward point."
+            Open "ROOT/taobin_project/xml/page_check_member.xml"
+
+        </EventClick>
+    </Button>
+
+    <Button>
+        <X> 286 </X>
+        <Y> 1128 </Y>
+        <Filename> Var( "ROOT/taobin_project/image/before_member/bn_change_pass" + Extension ) </Filename>
+        <FilenamePress> Var( "ROOT/taobin_project/image/before_member/bp_change_pass" + Extension ) </FilenamePress>
+        <FilenameDisable> Var( "ROOT/taobin_project/image/before_member/bp_change_pass" + Extension ) </FilenameDisable>
+        <EventClick>
+
+            Var ChangeMemberPassword = 1
+            Var CheckMemberTitleTH = "กรุณาใส่เบอร์มือถือ\nเพื่อเปลี่ยนรหัสผ่าน"
+            Var CheckMemberTitleEN = "Please enter your mobile number\nto change password."
             Open "ROOT/taobin_project/xml/page_check_member.xml"
 
         </EventClick>
diff --git a/xml/page_check_member.xml b/xml/page_check_member.xml
index 265b9e70..970ebd90 100644
--- a/xml/page_check_member.xml
+++ b/xml/page_check_member.xml
@@ -24,21 +24,25 @@
 	
 
     If show_eng = "true" Then 
+
+		Var CheckMemberTitle = CheckMemberTitleEN
+
 		Var DirImage = "ROOT/taobin_project/image/collectiing_en"
 		Var Xtext19 = 154
-	Else
-		Var DirImage = "ROOT/taobin_project/image/collectiing"
-	EndIf
-
-	If show_eng = "true" Then 
+		
 		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
 		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
 		
-	
+		PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_enter_your_mobile_to_credit_balance.mp3"
 	Else
+		Var CheckMemberTitle = CheckMemberTitleTH
+
+		Var DirImage = "ROOT/taobin_project/image/collectiing"
+		
 		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
 		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
-	
+		
+		PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_enter_your_mobile_to_credit_balance.mp3"
 	EndIf
 
 	
@@ -50,12 +54,6 @@
 
 	Var TaobinCredit = 0
 
-	  If show_eng = "true" Then 
-		PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_enter_your_mobile_to_credit_balance.mp3"
-	Else
-		PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_enter_your_mobile_to_credit_balance.mp3"
-	EndIf
-
 	Var show_eng_button_stage = "Enable"
 
 	;inter-max-number
@@ -191,6 +189,11 @@
 			;Open "ROOT/taobin_project/xml/page_check_member1.xml" 
 
 			If Ext1a = "ok" Then
+				
+				If ChangeMemberPassword = 1 Then
+					Open "ROOT/taobin_project/xml/page_payment_changePin1.xml"
+				EndIf
+
 				Open "ROOT/taobin_project/xml/page_check_member1.xml" 
 			Else
 				If Ext1a = "new customer" Then
@@ -632,11 +635,22 @@
 
 	
 
-<Image>
-<X> Xtext19 </X>
-<Y> 521 </Y>
-<Filename> Var( DirImage + "/text_19.png" )</Filename>
-</Image>
+;<Image>
+;<X> Xtext19 </X>
+;<Y> 521 </Y>
+;<Filename> Var( DirImage + "/text_19.png" )</Filename>
+;</Image>
+
+<Text>
+	<X> 0 </X>
+	<Y> 521 </Y>
+	<Width> 1080 </Width>
+	<Align> Center </Align>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x513C2F </Color>
+	<Size> 51 </Size>
+	<Value> CheckMemberTitle </Value>
+</Text>
 
 <Image>
 <X> 430 </X>
diff --git a/xml/page_payment_changePin1.xml b/xml/page_payment_changePin1.xml
index 8c99b845..4c3f5e24 100644
--- a/xml/page_payment_changePin1.xml
+++ b/xml/page_payment_changePin1.xml
@@ -738,7 +738,11 @@
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-    Open "ROOT/taobin_project/xml/page_check_member2.xml"
+	If ChangeMemberPassword = 1 Then
+		Open "ROOT/taobin_project/xml/page_before_check_member.xml"
+	Else
+    	Open "ROOT/taobin_project/xml/page_check_member2.xml"
+	EndIf
 </EventClick>
 </Button>
 
diff --git a/xml/page_payment_changePin2.xml b/xml/page_payment_changePin2.xml
index 291aa584..5233c39d 100644
--- a/xml/page_payment_changePin2.xml
+++ b/xml/page_payment_changePin2.xml
@@ -52,7 +52,11 @@
 	Var Timeout = Timeout + 1
 	If Timeout > 30 Then
         If ReqFlag = 0 Then
-           Open "ROOT/taobin_project/xml/page_check_member2.xml"
+          	If ChangeMemberPassword = 1 Then
+				Open "ROOT/taobin_project/xml/page_before_check_member.xml"
+			Else
+				Open "ROOT/taobin_project/xml/page_check_member2.xml"
+			EndIf
         EndIf
         Open "ROOT/taobin_project/xml/page_payment_changePinFailed.xml"
 	EndIf
@@ -750,7 +754,11 @@
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-    Open "ROOT/taobin_project/xml/page_check_member2.xml"
+    If ChangeMemberPassword = 1 Then
+		Open "ROOT/taobin_project/xml/page_before_check_member.xml"
+	Else
+    	Open "ROOT/taobin_project/xml/page_check_member2.xml"
+	EndIf
 </EventClick>
 </Button>
 
diff --git a/xml/page_payment_changePinFailed.xml b/xml/page_payment_changePinFailed.xml
index 3eec0b00..ea76552b 100644
--- a/xml/page_payment_changePinFailed.xml
+++ b/xml/page_payment_changePinFailed.xml
@@ -29,7 +29,11 @@
 
 	Var Timeout = Timeout + 1
 	If Timeout > 30 Then
-		Open "ROOT/taobin_project/xml/page_check_member2.xml"
+		If ChangeMemberPassword = 1 Then
+			Open "ROOT/taobin_project/xml/page_before_check_member.xml"
+		Else
+			Open "ROOT/taobin_project/xml/page_check_member2.xml"
+		EndIf
 	EndIf
 
     TimerReset
@@ -103,7 +107,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 
-    Open "ROOT/taobin_project/xml/page_check_member2.xml"
+    If ChangeMemberPassword = 1 Then
+		Open "ROOT/taobin_project/xml/page_before_check_member.xml"
+	Else
+    	Open "ROOT/taobin_project/xml/page_check_member2.xml"
+	EndIf
 </EventClick>
 </Button>
 
diff --git a/xml/page_payment_changePinSMS.xml b/xml/page_payment_changePinSMS.xml
index 8babea05..e9691be6 100644
--- a/xml/page_payment_changePinSMS.xml
+++ b/xml/page_payment_changePinSMS.xml
@@ -40,7 +40,11 @@
 		If PinSMSFlag = 1 Then
 			Open "ROOT/taobin_project/xml/page_check_member1.xml"
 		Else
-			Open "ROOT/taobin_project/xml/page_check_member2.xml"
+			If ChangeMemberPassword = 1 Then
+				Open "ROOT/taobin_project/xml/page_before_check_member.xml"
+			Else
+				Open "ROOT/taobin_project/xml/page_check_member2.xml"
+			EndIf
 		EndIf
 	EndIf
 
@@ -105,7 +109,11 @@
      	If PinSMSFlag = 1 Then
 			Open "ROOT/taobin_project/xml/page_check_member1.xml"
 		Else
-			Open "ROOT/taobin_project/xml/page_check_member2.xml"
+			If ChangeMemberPassword = 1 Then
+				Open "ROOT/taobin_project/xml/page_before_check_member.xml"
+			Else
+				Open "ROOT/taobin_project/xml/page_check_member2.xml"
+			EndIf
 		EndIf
 </EventClick>
 </Button>
diff --git a/xml/page_payment_changePinSuccess.xml b/xml/page_payment_changePinSuccess.xml
index e80682d8..01e8de69 100644
--- a/xml/page_payment_changePinSuccess.xml
+++ b/xml/page_payment_changePinSuccess.xml
@@ -29,7 +29,11 @@
 
 	Var Timeout = Timeout + 1
 	If Timeout > 30 Then
-		Open "ROOT/taobin_project/xml/page_check_member2.xml"
+		If ChangeMemberPassword = 1 Then
+			Open "ROOT/taobin_project/xml/page_before_check_member.xml"
+		Else
+			Open "ROOT/taobin_project/xml/page_check_member2.xml"
+		EndIf
 	EndIf
 
     TimerReset
@@ -101,7 +105,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
   
-     Open "ROOT/taobin_project/xml/page_check_member2.xml"
+    If ChangeMemberPassword = 1 Then
+		Open "ROOT/taobin_project/xml/page_before_check_member.xml"
+	Else
+    	Open "ROOT/taobin_project/xml/page_check_member2.xml"
+	EndIf
 </EventClick>
 </Button>