diff --git a/system/lan/english.json b/system/lan/english.json
index 80c43ea8..2b15d89e 100644
--- a/system/lan/english.json
+++ b/system/lan/english.json
@@ -799,5 +799,8 @@
     "To_download_from_private_paid_repository": "To download from private\/paid repository",
     "Set_your_Github_Authentication_first": "Set your Github Authentication first",
     "SMS_Notification": "SMS Notification",
-    "Customer_Registration_need_to_validate_using_OTP": "Customer Registration need to validate using OTP"
+    "Customer_Registration_need_to_validate_using_OTP": "Customer Registration need to validate using OTP",
+    "Registration_Username": "Registration Username",
+    "Registration": "Registration",
+    "For_Registration_and_Update_Phone_Number": "For Registration and Update Phone Number"
 }
\ No newline at end of file
diff --git a/ui/ui/customer/login-noreg.tpl b/ui/ui/customer/login-noreg.tpl
index ebf498b1..a0e6dd2e 100644
--- a/ui/ui/customer/login-noreg.tpl
+++ b/ui/ui/customer/login-noreg.tpl
@@ -16,17 +16,28 @@
                 <form action="{$_url}login/activation" method="post">
                     <input type="hidden" name="csrf_token" value="{$csrf_token}">
                     <div class="form-group">
-                        <label>{if $_c['country_code_phone']!= ''}{Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}</label>
+                        <label>
+                            {if $_c['registration_username'] == 'phone'}
+                                {Lang::T('Phone Number')}
+                            {elseif $_c['registration_username'] == 'email'}
+                                {Lang::T('Email')}
+                            {else}
+                                {Lang::T('Username')}
+                            {/if}
+                        </label>
                         <div class="input-group">
-                            {if $_c['country_code_phone']!= ''}
+                            {if $_c['registration_username'] == 'phone'}
                                 <span class="input-group-addon" id="basic-addon1"><i
                                         class="glyphicon glyphicon-phone-alt"></i></span>
+                            {elseif $_c['registration_username'] == 'email'}
+                                <span class="input-group-addon" id="basic-addon1"><i
+                                        class="glyphicon glyphicon-envelope"></i></span>
                             {else}
                                 <span class="input-group-addon" id="basic-addon1"><i
                                         class="glyphicon glyphicon-user"></i></span>
                             {/if}
-                            <input type="text" class="form-control" name="username" required
-                                placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']} {Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}">
+                            <input type="text" class="form-control" name="username"
+                                placeholder="{if $_c['country_code_phone']!= '' || $_c['registration_username'] == 'phone'}{$_c['country_code_phone']} {Lang::T('Phone Number')}{elseif $_c['registration_username'] == 'email'}{Lang::T('Email')}{else}{Lang::T('Username')}{/if}">
                         </div>
                     </div>
                     <div class="form-group">
diff --git a/ui/ui/customer/login.tpl b/ui/ui/customer/login.tpl
index 77fbb1da..acfe2d41 100644
--- a/ui/ui/customer/login.tpl
+++ b/ui/ui/customer/login.tpl
@@ -20,19 +20,29 @@
                 <form action="{$_url}login/post" method="post">
                     <input type="hidden" name="csrf_token" value="{$csrf_token}">
                     <div class="form-group">
-                        <label>{if $_c['country_code_phone']!= ''}{Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}</label>
+                        <label>
+                            {if $_c['registration_username'] == 'phone'}
+                                {Lang::T('Phone Number')}
+                            {elseif $_c['registration_username'] == 'email'}
+                                {Lang::T('Email')}
+                            {else}
+                                {Lang::T('Username')}
+                            {/if}
+                        </label>
                         <div class="input-group">
-                            {if $_c['country_code_phone']!= ''}
+                            {if $_c['registration_username'] == 'phone'}
                                 <span class="input-group-addon" id="basic-addon1"><i
                                         class="glyphicon glyphicon-phone-alt"></i></span>
+                            {elseif $_c['registration_username'] == 'email'}
+                                <span class="input-group-addon" id="basic-addon1"><i
+                                        class="glyphicon glyphicon-envelope"></i></span>
                             {else}
                                 <span class="input-group-addon" id="basic-addon1"><i
                                         class="glyphicon glyphicon-user"></i></span>
                             {/if}
                             <input type="text" class="form-control" name="username"
-                                placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']} {Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}">
+                                placeholder="{if $_c['country_code_phone']!= '' || $_c['registration_username'] == 'phone'}{$_c['country_code_phone']} {Lang::T('Phone Number')}{elseif $_c['registration_username'] == 'email'}{Lang::T('Email')}{else}{Lang::T('Username')}{/if}">
                         </div>
-
                     </div>
                     <div class="form-group">
                         <label>{Lang::T('Password')}</label>
diff --git a/ui/ui/customer/register-otp.tpl b/ui/ui/customer/register-otp.tpl
index 657bd4b3..f243e43f 100644
--- a/ui/ui/customer/register-otp.tpl
+++ b/ui/ui/customer/register-otp.tpl
@@ -17,17 +17,28 @@
                 <div class="panel-body">
                     <div class="form-container">
                         <div class="form-group">
-                            <label>{if $_c['country_code_phone']!= ''}{Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}</label>
+                            <label>
+                                {if $_c['registration_username'] == 'phone'}
+                                    {Lang::T('Phone Number')}
+                                {elseif $_c['registration_username'] == 'email'}
+                                    {Lang::T('Email')}
+                                {else}
+                                    {Lang::T('Username')}
+                                {/if}
+                            </label>
                             <div class="input-group">
-                                {if $_c['country_code_phone']!= ''}
+                                {if $_c['registration_username'] == 'phone'}
                                     <span class="input-group-addon" id="basic-addon1"><i
                                             class="glyphicon glyphicon-phone-alt"></i></span>
+                                {elseif $_c['registration_username'] == 'email'}
+                                    <span class="input-group-addon" id="basic-addon1"><i
+                                            class="glyphicon glyphicon-envelope"></i></span>
                                 {else}
                                     <span class="input-group-addon" id="basic-addon1"><i
                                             class="glyphicon glyphicon-user"></i></span>
                                 {/if}
                                 <input type="text" class="form-control" name="username" value="{$username}"
-                                    placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']} {Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}">
+                                    placeholder="{if $_c['country_code_phone']!= '' || $_c['registration_username'] == 'phone'}{$_c['country_code_phone']} {Lang::T('Phone Number')}{elseif $_c['registration_username'] == 'email'}{Lang::T('Email')}{else}{Lang::T('Username')}{/if}">
                             </div>
                         </div>
                         <div class="form-group">
diff --git a/ui/ui/customer/register-rotp.tpl b/ui/ui/customer/register-rotp.tpl
index c50d0197..bf195e73 100644
--- a/ui/ui/customer/register-rotp.tpl
+++ b/ui/ui/customer/register-rotp.tpl
@@ -19,17 +19,28 @@
                 <div class="panel-heading">1. {Lang::T('Register as Member')}</div>
                 <div class="panel-body">
                     <div class="form-group">
-                        <label>{if $_c['country_code_phone']!= ''}{Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}</label>
+                        <label>
+                            {if $_c['registration_username'] == 'phone'}
+                                {Lang::T('Phone Number')}
+                            {elseif $_c['registration_username'] == 'email'}
+                                {Lang::T('Email')}
+                            {else}
+                                {Lang::T('Username')}
+                            {/if}
+                        </label>
                         <div class="input-group">
-                            {if $_c['country_code_phone']!= ''}
+                            {if $_c['registration_username'] == 'phone'}
                                 <span class="input-group-addon" id="basic-addon1"><i
                                         class="glyphicon glyphicon-phone-alt"></i></span>
+                            {elseif $_c['registration_username'] == 'email'}
+                                <span class="input-group-addon" id="basic-addon1"><i
+                                        class="glyphicon glyphicon-envelope"></i></span>
                             {else}
                                 <span class="input-group-addon" id="basic-addon1"><i
                                         class="glyphicon glyphicon-user"></i></span>
                             {/if}
                             <input type="text" class="form-control" name="username"
-                                placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']} {Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}">
+                                placeholder="{if $_c['country_code_phone']!= '' || $_c['registration_username'] == 'phone'}{$_c['country_code_phone']} {Lang::T('Phone Number')}{elseif $_c['registration_username'] == 'email'}{Lang::T('Email')}{else}{Lang::T('Username')}{/if}">
                         </div>
                     </div>
                     <div class="btn-group btn-group-justified mb15">
diff --git a/ui/ui/customer/register.tpl b/ui/ui/customer/register.tpl
index 35945b71..247db74d 100644
--- a/ui/ui/customer/register.tpl
+++ b/ui/ui/customer/register.tpl
@@ -17,17 +17,28 @@
                 <div class="panel-body">
                     <div class="form-container">
                         <div class="md-input-container">
-                            <label>{if $_c['country_code_phone']!= ''}{Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}</label>
+                            <label>
+                                {if $_c['registration_username'] == 'phone'}
+                                    {Lang::T('Phone Number')}
+                                {elseif $_c['registration_username'] == 'email'}
+                                    {Lang::T('Email')}
+                                {else}
+                                    {Lang::T('Username')}
+                                {/if}
+                            </label>
                             <div class="input-group">
-                                {if $_c['country_code_phone']!= ''}
+                                {if $_c['registration_username'] == 'phone'}
                                     <span class="input-group-addon" id="basic-addon1"><i
                                             class="glyphicon glyphicon-phone-alt"></i></span>
+                                {elseif $_c['registration_username'] == 'email'}
+                                    <span class="input-group-addon" id="basic-addon1"><i
+                                            class="glyphicon glyphicon-envelope"></i></span>
                                 {else}
                                     <span class="input-group-addon" id="basic-addon1"><i
                                             class="glyphicon glyphicon-user"></i></span>
                                 {/if}
                                 <input type="text" class="form-control" name="username"
-                                    placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']} {Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}">
+                                    placeholder="{if $_c['country_code_phone']!= '' || $_c['registration_username'] == 'phone'}{$_c['country_code_phone']} {Lang::T('Phone Number')}{elseif $_c['registration_username'] == 'email'}{Lang::T('Email')}{else}{Lang::T('Username')}{/if}">
                             </div>
                         </div>
                         <div class="md-input-container md-float-label">