diff --git a/app/views/admin/registrars/_billing.html.erb b/app/views/admin/registrars/_billing.html.erb
new file mode 100644
index 000000000..f3960233e
--- /dev/null
+++ b/app/views/admin/registrars/_billing.html.erb
@@ -0,0 +1,17 @@
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <%= t '.header' %>
+    </div>
+    <div class="panel-body">
+        <dl class="dl-horizontal">
+            <dt><%= Registrar.human_attribute_name :vat_no %></dt>
+            <dd><%= registrar.vat_no %></dd>
+
+            <dt><%= Registrar.human_attribute_name :accounting_customer_code %></dt>
+            <dd><%= registrar.accounting_customer_code %></dd>
+
+            <dt><%= Registrar.human_attribute_name :billing_email %></dt>
+            <dd><%= registrar.billing_email %></dd>
+        </dl>
+    </div>
+</div>
diff --git a/app/views/admin/registrars/show.html.erb b/app/views/admin/registrars/show.html.erb
index c09602985..b42d1b9f3 100644
--- a/app/views/admin/registrars/show.html.erb
+++ b/app/views/admin/registrars/show.html.erb
@@ -41,12 +41,6 @@
                     <dd>
                         <%= @registrar.reg_no %>
                     </dd>
-                    <dt>
-                        <%= t(:vat_no) %>
-                    </dt>
-                    <dd>
-                        <%= @registrar.vat_no %>
-                    </dd>
                     <dt>
                         <%= t(:reference_no) %>
                     </dt>
@@ -71,12 +65,6 @@
                     <dd>
                         <%= @registrar.website %>
                     </dd>
-                    <dt>
-                        <%= Registrar.human_attribute_name :accounting_customer_code %>
-                    </dt>
-                    <dd>
-                        <%= @registrar.accounting_customer_code %>
-                    </dd>
                 </dl>
             </div>
         </div>
@@ -120,15 +108,10 @@
                     <dd>
                         <%= @registrar.billing_address %>
                     </dd>
-                    <dt>
-                        <%= t(:billing_email) %>
-                    </dt>
-                    <dd>
-                        <%= @registrar.billing_email %>
-                    </dd>
                 </dl>
             </div>
         </div>
+        <%= render 'billing', registrar: @registrar %>
         <%= render 'admin/registrars/show/preferences', registrar: registrar %>
     </div>
 </div>
diff --git a/config/locales/admin/registrars.en.yml b/config/locales/admin/registrars.en.yml
index 3d269f64b..e805b19c6 100644
--- a/config/locales/admin/registrars.en.yml
+++ b/config/locales/admin/registrars.en.yml
@@ -12,6 +12,9 @@ en:
         preferences:
           header: Preferences
 
+      billing:
+        header: Billing
+
       create:
         created: Registrar has been successfully created
         not_created: Unable to create registrar
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6b1dc7e31..89e7b0aad 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -199,7 +199,6 @@ en:
         alg: 'Algorithm'
         public_key: 'Public key'
       registrar:
-        billing_email: 'Billing e-mail'
         phone: 'Contact phone'
         email: 'Contact e-mail'
         state: 'State / Province'
@@ -782,3 +781,6 @@ en:
         delimiter: " "
         precision: 2
         unit: €
+
+  attributes:
+    vat_no: VAT number