diff --git a/Resources/Themes/Frontend/BootstrapBare/frontend/register/personal_fieldset.tpl b/Resources/Themes/Frontend/BootstrapBare/frontend/register/personal_fieldset.tpl
index 35eff42..0393b6e 100755
--- a/Resources/Themes/Frontend/BootstrapBare/frontend/register/personal_fieldset.tpl
+++ b/Resources/Themes/Frontend/BootstrapBare/frontend/register/personal_fieldset.tpl
@@ -16,7 +16,7 @@
                     <input type="hidden" name="register[personal][sValidation]" value="{$form_data.sValidation|escape}"/>
                 {else}
                     <div class="form-group{if isset($error_flags.customer_type)} has-error{/if} register-customertype sw5-plugin">
-                        {if {config name=showCompanySelectField}}
+                        {if {config name=showCompanySelectField} == 0}
                             <label for="register_personal_customer_type" class="{$FormLabelSize} control-label">{s name='RegisterPersonalLabelType'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}</label>
 
                             <div class="{$FormInputSize}">
@@ -25,14 +25,27 @@
                                         class="form-control is-required" 
                                         required="required" aria-required="true">
   
+
+                                    <option value="" disabled="disabled" {if $form_data.customer_type eq ""} selected="selected"{/if}>
+                                        {s name='RegisterPersonalLabelType'}{/s}{s name="RequiredField" namespace="frontend/register/index"}{/s}
+                                    </option>
+
                                     <option value="private"{if $form_data.customer_type eq "private"} selected="selected"{/if}>
                                         {s name='RegisterPersonalLabelPrivate'}{/s}
                                     </option>
+
                                     <option value="business"{if $form_data.customer_type eq "business" or $form_data.company or $form_data.sValidation} selected="selected"{/if}>
                                         {s name='RegisterPersonalLabelBusiness'}{/s}
                                     </option>
                                 </select>
                             </div>
+                        {elseif {config name=showCompanySelectField} == 2}
+                            {* Always register as a business customer*}
+                            <div class="hidden">
+                                <select id="register_personal_customer_type" name="register[personal][customer_type]">
+                                    <option value="business" selected="selected">{s name='RegisterPersonalLabelBusiness'}{/s}</option>
+                                </select>
+                            </div>
                         {else}
                             {* Always register as a private customer*}
                             <div class="hidden">
@@ -282,4 +295,4 @@
             {/if}
         {/block}
     </fieldset>
-{/block}
\ No newline at end of file
+{/block}