diff --git a/system/autoload/Admin.php b/system/autoload/Admin.php
index 2b31f337..eda42cde 100644
--- a/system/autoload/Admin.php
+++ b/system/autoload/Admin.php
@@ -73,7 +73,7 @@ class Admin
 
         return 0;
     }
-    
+
     public static function setCookie($aid)
     {
         global $db_pass, $config;
diff --git a/system/lan/english.json b/system/lan/english.json
index 2b15d89e..f991688d 100644
--- a/system/lan/english.json
+++ b/system/lan/english.json
@@ -802,5 +802,8 @@
     "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"
+    "For_Registration_and_Update_Phone_Number": "For Registration and Update Phone Number",
+    "Voucher_Only": "Voucher Only",
+    "No_Registration": "No Registration",
+    "Allow_Registration": "Allow Registration"
 }
\ No newline at end of file
diff --git a/ui/ui/app-settings.tpl b/ui/ui/app-settings.tpl
index 58bf07fd..b578ec9f 100644
--- a/ui/ui/app-settings.tpl
+++ b/ui/ui/app-settings.tpl
@@ -172,6 +172,27 @@
         </div>
         <div id="collapseRegistration" class="panel-collapse collapse" role="tabpanel">
             <div class="panel-body">
+                <div class="form-group">
+                    <label class="col-md-2 control-label">{Lang::T('Allow Registration')}</label>
+                    <div class="col-md-6">
+                        <select name="disable_registration" id="disable_registration" class="form-control">
+                            <option value="no" {if $_c['disable_registration']=='no' }selected="selected" {/if}>
+                                {Lang::T('Yes')}
+                            </option>
+                            {if $_c['disable_voucher'] != 'yes'}
+                                <option value="yes" {if $_c['disable_registration']=='yes' }selected="selected" {/if}>
+                                    {Lang::T('Voucher Only')}
+                                </option>
+                            {/if}
+                            <option value="noreg" {if $_c['disable_registration']=='noreg' }selected="selected" {/if}>
+                                {Lang::T('No Registration')}
+                            </option>
+                        </select>
+                    </div>
+                    <p class="help-block col-md-4">
+                        {Lang::T('Customer just Login with Phone number and Voucher Code, Voucher will be password')}
+                    </p>
+                </div>
                 <div class="form-group">
                     <label class="col-md-2 control-label">{Lang::T('Registration Username')}</label>
                     <div class="col-md-6">
@@ -218,7 +239,7 @@
                         </select>
                     </div>
                     <p class="help-block col-md-4">{Lang::T('The method which OTP will be sent to user')}<br>
-                    {Lang::T('For Registration and Update Phone Number')}</p>
+                        {Lang::T('For Registration and Update Phone Number')}</p>
                 </div>
                 <button class="btn btn-success btn-block" type="submit">
                     {Lang::T('Save Changes')}
@@ -271,23 +292,6 @@
                     <p class="help-block col-md-4">UPPERCASE lowercase RaNdoM</p>
                 </div>
                 {if $_c['disable_voucher'] != 'yes'}
-                    <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Disable Registration')}</label>
-                        <div class="col-md-6">
-                            <select name="disable_registration" id="disable_registration" class="form-control">
-                                <option value="no" {if $_c['disable_registration']=='no' }selected="selected" {/if}>
-                                    {Lang::T('No')}
-                                </option>
-                                <option value="yes" {if $_c['disable_registration']=='yes' }selected="selected" {/if}>
-                                    {Lang::T('Yes')}
-                                </option>
-                            </select>
-                        </div>
-                        <p class="help-block col-md-4">
-                            {Lang::T('Customer just Login with Phone number and Voucher Code, Voucher will be
-                        password')}
-                        </p>
-                    </div>
                     <div class="form-group">
                         <label class="col-md-2 control-label">{Lang::T('Redirect URL after Activation')}</label>
                         <div class="col-md-6">
diff --git a/ui/ui/customer/login.tpl b/ui/ui/customer/login.tpl
index acfe2d41..9dae48a7 100644
--- a/ui/ui/customer/login.tpl
+++ b/ui/ui/customer/login.tpl
@@ -63,9 +63,11 @@
                         </div>
                     </div>
                     <div class="btn-group btn-group-justified mb15">
-                        <div class="btn-group">
-                            <a href="{$_url}register" class="btn btn-success">{Lang::T('Register')}</a>
-                        </div>
+                        {if $_c['disable_registration'] != 'noreg'}
+                            <div class="btn-group">
+                                <a href="{$_url}register" class="btn btn-success">{Lang::T('Register')}</a>
+                            </div>
+                        {/if}
                         <div class="btn-group">
                             <button type="submit" class="btn btn-primary">{Lang::T('Login')}</button>
                         </div>