diff --git a/app/views/admin/domains/partials/_nameservers.haml b/app/views/admin/domains/partials/_nameservers.haml
index a87b32581..148b5e4ce 100644
--- a/app/views/admin/domains/partials/_nameservers.haml
+++ b/app/views/admin/domains/partials/_nameservers.haml
@@ -19,5 +19,5 @@
         %tfoot
           - @domain.errors.messages[:nameservers].each do |x|
             %tr
-              %td{colspan: 4}= x
+              %td{colspan: 3}= x
 
diff --git a/app/views/admin/registrars/show.haml b/app/views/admin/registrars/show.haml
index 5d234c8c3..d5748bd36 100644
--- a/app/views/admin/registrars/show.haml
+++ b/app/views/admin/registrars/show.haml
@@ -44,3 +44,40 @@
 
           %dt= t('shared.billing_address')
           %dd= @registrar.billing_address
+.row
+  .col-md-12
+    #users.panel.panel-default
+      .panel-heading.clearfix
+        = t('shared.users')
+      .table-responsive
+        %table.table.table-hover.table-bordered.table-condensed
+          %thead
+            %tr
+              %th{class: 'col-xs-3'}= t('shared.username')
+              %th{class: 'col-xs-3'}= t('shared.email')
+              %th{class: 'col-xs-3'}= t('shared.identity_code')
+              %th{class: 'col-xs-3'}= t('shared.admin')
+          %tbody
+            - @registrar.users.each do |x|
+              %tr
+                %td= link_to(x, [:admin, x])
+                %td= x.email
+                %td= x.identity_code
+                %td= x.admin
+
+.row
+  .col-md-12
+    #epp-users.panel.panel-default
+      .panel-heading.clearfix
+        = t('shared.epp_users')
+      .table-responsive
+        %table.table.table-hover.table-bordered.table-condensed
+          %thead
+            %tr
+              %th{class: 'col-xs-6'}= t('shared.username')
+              %th{class: 'col-xs-6'}= t('shared.active')
+          %tbody
+            - @registrar.epp_users.each do |x|
+              %tr
+                %td= link_to(x, [:admin, x])
+                %td= x.active