diff --git a/app/views/admin/registrars/_form.html.erb b/app/views/admin/registrars/_form.html.erb
index b163f0168..7bdddb5d9 100644
--- a/app/views/admin/registrars/_form.html.erb
+++ b/app/views/admin/registrars/_form.html.erb
@@ -27,15 +27,6 @@
                         </div>
                     </div>
 
-                    <div class="form-group">
-                        <div class="col-md-4 control-label">
-                            <%= f.label :vat_no %>
-                        </div>
-                        <div class="col-md-7">
-                            <%= f.text_field(:vat_no, class: 'form-control') %>
-                        </div>
-                    </div>
-
                     <div class="form-group">
                         <div class="col-md-4 control-label">
                             <%= f.label :phone %>
@@ -62,24 +53,6 @@
                             <%= f.email_field :email, required: true, class: 'form-control' %>
                         </div>
                     </div>
-
-                    <div class="form-group">
-                        <div class="col-md-4 control-label">
-                            <%= f.label :billing_email %>
-                        </div>
-                        <div class="col-md-7">
-                            <%= f.email_field :billing_email, class: 'form-control' %>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <div class="col-md-4 control-label">
-                            <%= f.label :accounting_customer_code %>
-                        </div>
-                        <div class="col-md-7">
-                            <%= f.text_field :accounting_customer_code, class: 'form-control', required: true %>
-                        </div>
-                    </div>
                 </div>
             </div>
         </div>
@@ -143,6 +116,8 @@
         </div>
     </div>
 
+    <%= render 'admin/registrars/form/billing', f: f %>
+
     <div class="row">
         <div class="col-md-8">
             <div class="panel panel-default">
diff --git a/app/views/admin/registrars/form/_billing.html.erb b/app/views/admin/registrars/form/_billing.html.erb
new file mode 100644
index 000000000..a3adf1312
--- /dev/null
+++ b/app/views/admin/registrars/form/_billing.html.erb
@@ -0,0 +1,40 @@
+<div class="row">
+    <div class="col-md-8">
+        <div class="panel panel-default">
+            <div class="panel-heading clearfix">
+                <div class="pull-left">
+                    <%= t '.header' %>
+                </div>
+            </div>
+
+            <div class="panel-body">
+                <div class="form-group">
+                    <div class="col-md-4 control-label">
+                        <%= f.label :vat_no %>
+                    </div>
+                    <div class="col-md-7">
+                        <%= f.text_field :vat_no, class: 'form-control' %>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <div class="col-md-4 control-label">
+                        <%= f.label :accounting_customer_code %>
+                    </div>
+                    <div class="col-md-7">
+                        <%= f.text_field :accounting_customer_code, class: 'form-control', required: true %>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <div class="col-md-4 control-label">
+                        <%= f.label :billing_email %>
+                    </div>
+                    <div class="col-md-7">
+                        <%= f.email_field :billing_email, class: 'form-control' %>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/config/locales/admin/registrars.en.yml b/config/locales/admin/registrars.en.yml
index b30ad456e..7d1846e05 100644
--- a/config/locales/admin/registrars.en.yml
+++ b/config/locales/admin/registrars.en.yml
@@ -21,3 +21,6 @@ en:
         misc: Miscellaneous
         create_btn: Create registrar
         update_btn: Update registrar
+
+        billing:
+          header: Billing