diff --git a/GMERemittance/Module/Login/User Interface/View/Login.storyboard b/GMERemittance/Module/Login/User Interface/View/Login.storyboard
index 51893b8e..1d2d273d 100644
--- a/GMERemittance/Module/Login/User Interface/View/Login.storyboard	
+++ b/GMERemittance/Module/Login/User Interface/View/Login.storyboard	
@@ -179,9 +179,8 @@
                                                                 </connections>
                                                             </button>
                                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kqa-0q-2EH">
-                                                                <rect key="frame" x="85" y="44" width="87" height="25"/>
+                                                                <rect key="frame" x="85" y="44" width="82" height="25"/>
                                                                 <constraints>
-                                                                    <constraint firstAttribute="width" constant="87" id="nlf-y6-7jX"/>
                                                                     <constraint firstAttribute="height" constant="25" id="pNr-CR-bhL"/>
                                                                 </constraints>
                                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
@@ -193,10 +192,9 @@
                                                                 </connections>
                                                             </button>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="New to GME?" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qZa-bQ-H7i">
-                                                                <rect key="frame" x="2" y="49" width="82" height="17"/>
+                                                                <rect key="frame" x="2" y="49" width="78" height="17"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="height" constant="17" id="8dI-um-hz2"/>
-                                                                    <constraint firstAttribute="width" constant="82" id="n2H-KT-zZD"/>
                                                                 </constraints>
                                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
                                                                 <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
@@ -204,10 +202,10 @@
                                                             </label>
                                                         </subviews>
                                                         <constraints>
-                                                            <constraint firstAttribute="width" constant="176" id="0Re-0r-gE5"/>
+                                                            <constraint firstAttribute="width" priority="997" constant="176" id="0Re-0r-gE5"/>
                                                             <constraint firstItem="qZa-bQ-H7i" firstAttribute="leading" secondItem="T4Z-0g-COi" secondAttribute="leading" constant="2" id="4cI-Cn-fIa"/>
                                                             <constraint firstItem="R7p-5T-ler" firstAttribute="top" secondItem="T4Z-0g-COi" secondAttribute="top" constant="4" id="Naq-20-ZV3"/>
-                                                            <constraint firstItem="kqa-0q-2EH" firstAttribute="leading" secondItem="qZa-bQ-H7i" secondAttribute="trailing" constant="1" id="PIL-RA-3bk"/>
+                                                            <constraint firstItem="kqa-0q-2EH" firstAttribute="leading" secondItem="qZa-bQ-H7i" secondAttribute="trailing" constant="5" id="PIL-RA-3bk"/>
                                                             <constraint firstAttribute="height" constant="60" id="Qbd-kQ-rcs"/>
                                                             <constraint firstItem="kqa-0q-2EH" firstAttribute="top" secondItem="R7p-5T-ler" secondAttribute="bottom" constant="20" id="crw-I2-Dc1"/>
                                                             <constraint firstItem="qZa-bQ-H7i" firstAttribute="top" secondItem="R7p-5T-ler" secondAttribute="bottom" constant="25" id="mb2-LJ-gr9"/>
diff --git a/GMERemittance/Module/Login/User Interface/View/LoginViewController.swift b/GMERemittance/Module/Login/User Interface/View/LoginViewController.swift
index 6aa2994c..1223a7db 100644
--- a/GMERemittance/Module/Login/User Interface/View/LoginViewController.swift	
+++ b/GMERemittance/Module/Login/User Interface/View/LoginViewController.swift	
@@ -7,19 +7,20 @@
 //
 
 import UIKit
+import Localize_Swift
 
 class LoginViewController: UIViewController {
     struct StringConstants {
-        static let headerTitle = "Welcome to
Global Money Express"
-        static let subHeaderTitle = "Login with your email address "
-        static let userIdTitle = "User ID"
-        static let userIdPlaceholder = "Registered Email"
-        static let passwordTitle = "Password"
+        static let headerTitle = "login_title_text".localized()
+        static let subHeaderTitle = "login_subtitle_text".localized()
+        static let userIdTitle = "login_user_id_text".localized()
+        static let userIdPlaceholder = "user_Id_placeholder_text".localized()
+        static let passwordTitle = "password_text".localized()
         
-        static let forgotPasswordText = "Forgot password?"
-        static let newToGmeText = "New to GME?"
-        static let registerHereText = "Register Here"
-        static let loginText = "Login"
+        static let forgotPasswordText = "forgot_password_text".localized()
+        static let newToGmeText = "new_to_gme_text".localized()
+        static let registerHereText = "login_register_here_text".localized()
+        static let loginText = "login_text".localized()
     }
     
     
@@ -59,10 +60,11 @@ class LoginViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         self.setup()
-        configureViews()
+        configureLanguage()
     }
     
-    private func configureViews() {
+    private func configureLanguage() {
+        Localize.setCurrentLanguage("th")
         self.headerTitle.text = StringConstants.headerTitle
         self.subtitle.text = StringConstants.subHeaderTitle
         self.userIdTitleLabel.text = StringConstants.userIdTitle
diff --git a/GMERemittance/Module/Register/User Interface/View/RegisterViewController.swift b/GMERemittance/Module/Register/User Interface/View/RegisterViewController.swift
index 922f5ebe..fb0c9717 100644
--- a/GMERemittance/Module/Register/User Interface/View/RegisterViewController.swift	
+++ b/GMERemittance/Module/Register/User Interface/View/RegisterViewController.swift	
@@ -11,18 +11,18 @@ import UIKit
 class RegisterViewController: UIViewController {
     
     struct StringConstants {
-        static let userIdTitle = "User ID"
-        static let useridPlaceholder = "Email"
-        static let passwordTitle = "Password"
-        static let passwordPlaceholder = "Create Password"
+        static let userIdTitle = "login_user_id_text".localized()
+        static let useridPlaceholder = "email_text".localized()
+        static let passwordTitle = "password_text".localized()
+        static let passwordPlaceholder = "create_password_text".localized()
         
-        static let confirmPasswordTitle = "Confirm Password"
-        static let confirmPasswordPlaceholder = "Confirm Password"
+        static let confirmPasswordTitle = "confirm_password_text".localized()
+        static let confirmPasswordPlaceholder = "confirm_password_text".localized()
         
-        static let dobTitlePlaceholder = "Date Of Birth"
-        static let alreadyHaveAccountText = "Already have an Account?"
-        static let loginText = "Login"
-        static let registerText = "Register"
+        static let dobTitlePlaceholder = "dob_text".localized()
+        static let alreadyHaveAccountText = "already_have_account_text".localized()
+        static let loginText = "login_text".localized()
+        static let registerText = "register_text".localized()
     }
     
     // MARK: IBOutlets