diff --git a/system/controllers/settings.php b/system/controllers/settings.php
index 8423c91b..3c10a010 100644
--- a/system/controllers/settings.php
+++ b/system/controllers/settings.php
@@ -394,6 +394,7 @@ switch ($action) {
     case 'localisation-post':
         $tzone = _post('tzone');
         $date_format = _post('date_format');
+        $country_code_phone = _post('country_code_phone');
         $lan = _post('lan');
         run_hook('save_localisation'); #HOOK
         if ($tzone == '' or $date_format == '' or $lan == '') {
@@ -421,6 +422,18 @@ switch ($action) {
                 $d->save();
             }
 
+
+            $d = ORM::for_table('tbl_appconfig')->where('setting', 'country_code_phone')->find_one();
+            if($d){
+                $d->value = $country_code_phone;
+                $d->save();
+            }else{
+                $d = ORM::for_table('tbl_appconfig')->create();
+                $d->setting = 'country_code_phone';
+                $d->value = $country_code_phone;
+                $d->save();
+            }
+
             $currency_code = $_POST['currency_code'];
             $d = ORM::for_table('tbl_appconfig')->where('setting', 'currency_code')->find_one();
             $d->value = $currency_code;
diff --git a/ui/ui/app-localisation.tpl b/ui/ui/app-localisation.tpl
index ebbc960a..a5ca2ba5 100644
--- a/ui/ui/app-localisation.tpl
+++ b/ui/ui/app-localisation.tpl
@@ -1,80 +1,107 @@
 {include file="sections/header.tpl"}
 
-		<div class="row">
-			<div class="col-sm-12 col-md-12">
-				<div class="panel panel-primary panel-hovered panel-stacked mb30">
-					<div class="panel-heading">{$_L['Localisation']}</div>
-						<div class="panel-body">
+<div class="row">
+    <div class="col-sm-12 col-md-12">
+        <div class="panel panel-primary panel-hovered panel-stacked mb30">
+            <div class="panel-heading">{$_L['Localisation']}</div>
+            <div class="panel-body">
 
-                <form class="form-horizontal" method="post" role="form" action="{$_url}settings/localisation-post" >
+                <form class="form-horizontal" method="post" role="form" action="{$_url}settings/localisation-post">
                     <div class="form-group">
-						<label class="col-md-2 control-label">{$_L['Timezone']}</label>
-						<div class="col-md-6">
-							<select name="tzone" id="tzone" class="form-control">
-								{foreach $tlist as $value => $label}
-									<option value="{$value}" {if $_c['timezone'] eq $value}selected="selected" {/if}>{$label}</option>
-								{/foreach}
-							</select>
-						</div>
-                    </div>
-                    <div class="form-group">
-						<label class="col-md-2 control-label">{$_L['Date_Format']}</label>
-						<div class="col-md-6">
-							<select class="form-control" name="date_format" id="date_format">
-								<option value="d/m/Y" {if $_c['date_format'] eq 'd/m/Y'} selected="selected" {/if}>{date('d/m/Y')}</option>
-								<option value="d.m.Y" {if $_c['date_format'] eq 'd.m.Y'} selected="selected" {/if}>{date('d.m.Y')}</option>
-								<option value="d-m-Y" {if $_c['date_format'] eq 'd-m-Y'} selected="selected" {/if}>{date('d-m-Y')}</option>
-								<option value="m/d/Y" {if $_c['date_format'] eq 'm/d/Y'} selected="selected" {/if}>{date('m/d/Y')}</option>
-								<option value="Y/m/d" {if $_c['date_format'] eq 'Y/m/d'} selected="selected" {/if}>{date('Y/m/d')}</option>
-								<option value="Y-m-d" {if $_c['date_format'] eq 'Y-m-d'} selected="selected" {/if}>{date('Y-m-d')}</option>
-								<option value="M d Y" {if $_c['date_format'] eq 'M d Y'} selected="selected" {/if}>{date('M d Y')}</option>
-								<option value="d M Y" {if $_c['date_format'] eq 'd M Y'} selected="selected" {/if}>{date('d M Y')}</option>
-								<option value="jS M y" {if $_c['date_format'] eq 'jS M y'} selected="selected" {/if}>{date('jS M y')}</option>
-							</select>
-						</div>
-                    </div>
-                    <div class="form-group">
-						<label class="col-md-2 control-label">{$_L['Default_Language']}</label>
-						<div class="col-md-4">
-							<select class="form-control" name="lan" id="lan">
-								{foreach $lan as $lans}
-									<option value="{$lans['folder']}" {if $_c['language'] eq $lans['folder']} selected="selected" {/if}>{$lans['name']}</option>
+                        <label class="col-md-2 control-label">{$_L['Timezone']}</label>
+                        <div class="col-md-6">
+                            <select name="tzone" id="tzone" class="form-control">
+                                {foreach $tlist as $value => $label}
+                                    <option value="{$value}" {if $_c['timezone'] eq $value}selected="selected" {/if}>
+                                        {$label}</option>
                                 {/foreach}
-							</select>
-						</div>
-						<div class="col-md-2">
-							<a href="{$_url}settings/language" type="button" class="btn btn-line-success btn-icon-inline"><i class="ion ion-android-add"></i>{$_L['Add_Language']}</a>
-						</div>
+                            </select>
+                        </div>
                     </div>
                     <div class="form-group">
-						<label class="col-md-2 control-label">{$_L['Decimal_Point']}</label>
-						<div class="col-md-6">
-							<input type="text" class="form-control" id="dec_point" name="dec_point" value="{$_c['dec_point']}">
-						</div>
+                        <label class="col-md-2 control-label">{$_L['Date_Format']}</label>
+                        <div class="col-md-6">
+                            <select class="form-control" name="date_format" id="date_format">
+                                <option value="d/m/Y" {if $_c['date_format'] eq 'd/m/Y'} selected="selected" {/if}>
+                                    {date('d/m/Y')}</option>
+                                <option value="d.m.Y" {if $_c['date_format'] eq 'd.m.Y'} selected="selected" {/if}>
+                                    {date('d.m.Y')}</option>
+                                <option value="d-m-Y" {if $_c['date_format'] eq 'd-m-Y'} selected="selected" {/if}>
+                                    {date('d-m-Y')}</option>
+                                <option value="m/d/Y" {if $_c['date_format'] eq 'm/d/Y'} selected="selected" {/if}>
+                                    {date('m/d/Y')}</option>
+                                <option value="Y/m/d" {if $_c['date_format'] eq 'Y/m/d'} selected="selected" {/if}>
+                                    {date('Y/m/d')}</option>
+                                <option value="Y-m-d" {if $_c['date_format'] eq 'Y-m-d'} selected="selected" {/if}>
+                                    {date('Y-m-d')}</option>
+                                <option value="M d Y" {if $_c['date_format'] eq 'M d Y'} selected="selected" {/if}>
+                                    {date('M d Y')}</option>
+                                <option value="d M Y" {if $_c['date_format'] eq 'd M Y'} selected="selected" {/if}>
+                                    {date('d M Y')}</option>
+                                <option value="jS M y" {if $_c['date_format'] eq 'jS M y'} selected="selected" {/if}>
+                                    {date('jS M y')}</option>
+                            </select>
+                        </div>
                     </div>
                     <div class="form-group">
-						<label class="col-md-2 control-label">{$_L['Thousands_Separator']}</label>
-						<div class="col-md-6">
-							<input type="text" class="form-control" id="thousands_sep" name="thousands_sep" value="{$_c['thousands_sep']}">
-						</div>
+                        <label class="col-md-2 control-label">{$_L['Default_Language']}</label>
+                        <div class="col-md-4">
+                            <select class="form-control" name="lan" id="lan">
+                                {foreach $lan as $lans}
+                                    <option value="{$lans['folder']}" {if $_c['language'] eq $lans['folder']}
+                                        selected="selected" {/if}>{$lans['name']}</option>
+                                {/foreach}
+                            </select>
+                        </div>
+                        <div class="col-md-2">
+                            <a href="{$_url}settings/language" type="button"
+                                class="btn btn-line-success btn-icon-inline"><i
+                                    class="ion ion-android-add"></i>{$_L['Add_Language']}</a>
+                        </div>
                     </div>
                     <div class="form-group">
-						<label class="col-md-2 control-label">{$_L['Currency_Code']}</label>
-						<div class="col-md-6">
-							<input type="text" class="form-control" id="currency_code" name="currency_code" value="{$_c['currency_code']}">
-							<span class="help-block">{$_L['currency_help']}</span>
-						</div>
+                        <label class="col-md-2 control-label">{$_L['Decimal_Point']}</label>
+                        <div class="col-md-6">
+                            <input type="text" class="form-control" id="dec_point" name="dec_point"
+                                value="{$_c['dec_point']}">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{$_L['Thousands_Separator']}</label>
+                        <div class="col-md-6">
+                            <input type="text" class="form-control" id="thousands_sep" name="thousands_sep"
+                                value="{$_c['thousands_sep']}">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{$_L['Currency_Code']}</label>
+                        <div class="col-md-6">
+                            <input type="text" class="form-control" id="currency_code" name="currency_code"
+                                value="{$_c['currency_code']}">
+                            <span class="help-block">{$_L['currency_help']}</span>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{Lang::T('Country Code Phone')}</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" id="country_code_phone" placeholder="62"
+                                    name="country_code_phone" value="{$_c['country_code_phone']}">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <div class="col-lg-offset-2 col-lg-10">
+                            <button class="btn btn-primary waves-effect waves-light"
+                                type="submit">{$_L['Save']}</button>
+                        </div>
                     </div>
-					<div class="form-group">
-						<div class="col-lg-offset-2 col-lg-10">
-							<button class="btn btn-primary waves-effect waves-light" type="submit">{$_L['Save']}</button>
-						</div>
-					</div>
                 </form>
-				
-					</div>
-				</div>
-			</div>
-		</div>
 
-{include file="sections/footer.tpl"}
+            </div>
+        </div>
+    </div>
+</div>
+
+{include file="sections/footer.tpl"}
\ No newline at end of file
diff --git a/ui/ui/register-otp.tpl b/ui/ui/register-otp.tpl
index bd48de86..cd571d4a 100644
--- a/ui/ui/register-otp.tpl
+++ b/ui/ui/register-otp.tpl
@@ -45,8 +45,11 @@
                             <div class="form-container">
                                 <div class="form-group">
                                 <label>{$_L['Phone_Number']}</label>
-                                    <input type="text" required class="form-control" readonly id="username"
-                                        value="{$username}" placeholder="{$_L['Phone_Number']}" name="username">
+                                    <div class="input-group">
+                                        <span class="input-group-addon" id="basic-addon1">+</span>
+                                        <input type="text" class="form-control" name="username" value="{$username}"
+                                            placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {$_L['Phone_Number']}">
+                                    </div>
                                 </div>
                                 <div class="form-group">
                                 <label>{Lang::T('SMS Verification Code')}</label>
diff --git a/ui/ui/register-rotp.tpl b/ui/ui/register-rotp.tpl
index 87b80247..8cfe5b7a 100644
--- a/ui/ui/register-rotp.tpl
+++ b/ui/ui/register-rotp.tpl
@@ -58,8 +58,11 @@
                         <div class="panel-body">
                             <div class="form-group">
                                 <label>{$_L['Phone_Number']}</label>
-                                <input type="text" class="form-control" name="username"
-                                    placeholder="{$_L['Phone_Number']}">
+                                <div class="input-group">
+                                    <span class="input-group-addon" id="basic-addon1">+</span>
+                                    <input type="text" class="form-control" name="username"
+                                        placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {$_L['Phone_Number']}">
+                                </div>
                             </div>
                             <div class="btn-group btn-group-justified mb15">
                                 <div class="btn-group">
diff --git a/ui/ui/register.tpl b/ui/ui/register.tpl
index 9b071830..c0777380 100644
--- a/ui/ui/register.tpl
+++ b/ui/ui/register.tpl
@@ -45,8 +45,11 @@
                             <div class="form-container">
                                 <div class="md-input-container">
                                     <label>{$_L['Phone_Number']}</label>
-                                    <input type="text" required class="form-control" id="username" value="{$username}"
-                                        placeholder="{$_L['Phone_Number']}" name="username">
+                                    <div class="input-group">
+                                        <span class="input-group-addon" id="basic-addon1">+</span>
+                                        <input type="text" class="form-control" name="username"
+                                            placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {$_L['Phone_Number']}">
+                                    </div>
                                 </div>
                                 <div class="md-input-container md-float-label">
                                     <label>{$_L['Full_Name']}</label>
diff --git a/ui/ui/user-login.tpl b/ui/ui/user-login.tpl
index 40640367..ddecc803 100644
--- a/ui/ui/user-login.tpl
+++ b/ui/ui/user-login.tpl
@@ -40,35 +40,39 @@
                 <div class="panel panel-primary">
                     <div class="panel-heading">{$_L['Sign_In_Member']}</div>
                     <div class="panel-body">
-                            <form action="{$_url}login/post" method="post">
-                                <div class="form-group">
-                                    <label>{$_L['Phone_Number']}</label>
+                        <form action="{$_url}login/post" method="post">
+                            <div class="form-group">
+                                <label>{$_L['Phone_Number']}</label>
+                                <div class="input-group">
+                                    <span class="input-group-addon" id="basic-addon1">+</span>
                                     <input type="text" class="form-control" name="username"
-                                        placeholder="{$_L['Phone_Number']}">
-                                </div>
-                                <div class="form-group">
-                                    <label>{$_L['Password']}</label>
-                                    <input type="password" class="form-control" name="password"
-                                        placeholder="{$_L['Password']}">
+                                        placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {$_L['Phone_Number']}">
                                 </div>
 
-                                <div class="clearfix hidden">
-                                    <div class="ui-checkbox ui-checkbox-primary right">
-                                        <label>
-                                            <input type="checkbox">
-                                            <span>Remember me</span>
-                                        </label>
-                                    </div>
+                            </div>
+                            <div class="form-group">
+                                <label>{$_L['Password']}</label>
+                                <input type="password" class="form-control" name="password"
+                                    placeholder="{$_L['Password']}">
+                            </div>
+
+                            <div class="clearfix hidden">
+                                <div class="ui-checkbox ui-checkbox-primary right">
+                                    <label>
+                                        <input type="checkbox">
+                                        <span>Remember me</span>
+                                    </label>
                                 </div>
-                                <div class="btn-group btn-group-justified mb15">
-                                    <div class="btn-group">
-                                        <button type="submit" class="btn btn-primary">{$_L['Login']}</button>
-                                    </div>
-                                    <div class="btn-group">
-                                        <a href="{$_url}register" class="btn btn-success">{$_L['Register']}</a>
-                                    </div>
+                            </div>
+                            <div class="btn-group btn-group-justified mb15">
+                                <div class="btn-group">
+                                    <button type="submit" class="btn btn-primary">{$_L['Login']}</button>
                                 </div>
-                            </form>
+                                <div class="btn-group">
+                                    <a href="{$_url}register" class="btn btn-success">{$_L['Register']}</a>
+                                </div>
+                            </div>
+                        </form>
                     </div>
                 </div>
             </div>
diff --git a/ui/ui/user-profile.tpl b/ui/ui/user-profile.tpl
index 83af1118..e96078b6 100644
--- a/ui/ui/user-profile.tpl
+++ b/ui/ui/user-profile.tpl
@@ -12,8 +12,12 @@
                     <div class="form-group">
                         <label class="col-md-2 control-label">{$_L['Username']}</label>
                         <div class="col-md-6">
-                            <input type="text" class="form-control" id="username" name="username"
-                                value="{$d['username']}" readonly>
+                            <div class="input-group">
+                                <span class="input-group-addon" id="basic-addon1">+</span>
+                                <input type="text" class="form-control" name="username" id="username"
+                                    value="{$d['username']}"
+                                    placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {$_L['Phone_Number']}">
+                            </div>
                         </div>
                     </div>
                     <div class="form-group">
@@ -33,15 +37,18 @@
                     <div class="form-group">
                         <label class="col-md-2 control-label">{$_L['Phone_Number']}</label>
                         <div class="col-md-6">
-                            <input type="text" class="form-control" id="phonenumber" name="phonenumber"
-                                value="{$d['phonenumber']}">
+                            <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} {$_L['Phone_Number']}">
+                            </div>
                         </div>
                     </div>
                     <div class="form-group">
                         <label class="col-md-2 control-label">{Lang::T('Email')}</label>
                         <div class="col-md-6">
-                            <input type="text" class="form-control" id="email" name="email"
-                                value="{$d['email']}">
+                            <input type="text" class="form-control" id="email" name="email" value="{$d['email']}">
                         </div>
                     </div>