diff --git a/system/autoload/Lang.php b/system/autoload/Lang.php
index f2becec3..385bb06a 100644
--- a/system/autoload/Lang.php
+++ b/system/autoload/Lang.php
@@ -12,6 +12,7 @@ class Lang
     {
         global $_L, $lan_file, $config;
         $_L = $_SESSION['Lang'];
+        $key = preg_replace('/\s+/', ' ', $key);
         if (!empty($_L[$key])) {
             return $_L[$key];
         }
diff --git a/system/lan/english.json b/system/lan/english.json
index e254e969..03a44a52 100644
--- a/system/lan/english.json
+++ b/system/lan/english.json
@@ -427,5 +427,16 @@
     "Code": "Code",
     "Send_To_Customer": "Send To Customer",
     "Prev": "Prev",
-    "Voucher_Not_Found": "Voucher Not Found"
+    "Voucher_Not_Found": "Voucher Not Found",
+    "Miscellaneous": "Miscellaneous",
+    "OTP_Required": "OTP Required",
+    "Change": "Change",
+    "Change_Phone_Number": "Change Phone Number",
+    "Current_Number": "Current Number",
+    "New_Number": "New Number",
+    "Input_your_phone_number": "Input your phone number",
+    "OTP": "OTP",
+    "Enter_OTP_that_was_sent_to_your_phone": "Enter OTP that was sent to your phone",
+    "Update": "Update",
+    "OTP_is_required_when_user_want_to_change_phone_number": "OTP is required when user want to change phone number"
 }
\ No newline at end of file
diff --git a/ui/ui/user-profile.tpl b/ui/ui/user-profile.tpl
index 336856e8..c6b5d17c 100644
--- a/ui/ui/user-profile.tpl
+++ b/ui/ui/user-profile.tpl
@@ -34,34 +34,34 @@
                             <textarea name="address" id="address" class="form-control">{$d['address']}</textarea>
                         </div>
                     </div>
-                    {if $_c['allow_phone_otp'] == 'no'}
-                    <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Phone Number')}</label>
-                        <div class="col-md-6">
-                            <div class="input-group">
-                                <span class="input-group-addon" id="basic-addon1">+</span>
-                                <input type="text" class="form-control" name="phonenumber" id="phonenumber"
-                                    value="{$d['phonenumber']}"
-                                    placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone Number')}">
+                    {if $_c['allow_phone_otp'] != 'yes'}
+                        <div class="form-group">
+                            <label class="col-md-2 control-label">{Lang::T('Phone Number')}</label>
+                            <div class="col-md-6">
+                                <div class="input-group">
+                                    <span class="input-group-addon" id="basic-addon1">+</span>
+                                    <input type="text" class="form-control" name="phonenumber" id="phonenumber"
+                                        value="{$d['phonenumber']}"
+                                        placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone Number')}">
+                                </div>
                             </div>
                         </div>
-                    </div>
-                    {elseif $_c['allow_phone_otp'] == 'yes'}
-                    <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Phone Number')}</label>
-                        <div class="col-md-6">
-                            <div class="input-group">
-                                <span class="input-group-addon" id="basic-addon1">+</span>
-                                <input type="text" class="form-control" name="phonenumber" id="phonenumber"
-                                    value="{$d['phonenumber']}" readonly
-                                    placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone Number')}">
-                                <span class="input-group-btn">
-                                    <a href="{$_url}accounts/phone-update" type="button"
-                                        class="btn btn-info btn-flat">{Lang::T('Change')}</a>
-                                </span>
+                    {else}
+                        <div class="form-group">
+                            <label class="col-md-2 control-label">{Lang::T('Phone Number')}</label>
+                            <div class="col-md-6">
+                                <div class="input-group">
+                                    <span class="input-group-addon" id="basic-addon1">+</span>
+                                    <input type="text" class="form-control" name="phonenumber" id="phonenumber"
+                                        value="{$d['phonenumber']}" readonly
+                                        placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone Number')}">
+                                    <span class="input-group-btn">
+                                        <a href="{$_url}accounts/phone-update" type="button"
+                                            class="btn btn-info btn-flat">{Lang::T('Change')}</a>
+                                    </span>
+                                </div>
                             </div>
                         </div>
-                    </div>
                     {/if}
                     <div class="form-group">
                         <label class="col-md-2 control-label">{Lang::T('Email')}</label>
@@ -72,8 +72,8 @@
 
                     <div class="form-group">
                         <div class="col-lg-offset-2 col-lg-10">
-                            <button class="btn btn-success waves-effect waves-light" type="submit">{Lang::T('Save
-                                Changes')}</button>
+                            <button class="btn btn-success waves-effect waves-light" type="submit">
+                            {Lang::T('Save Changes')}</button>
                             Or <a href="{$_url}home">{Lang::T('Cancel')}</a>
                         </div>
                     </div>