diff --git a/app/controllers/admin/api_users_controller.rb b/app/controllers/admin/api_users_controller.rb
index c3c359e3c..96ca2bc98 100644
--- a/app/controllers/admin/api_users_controller.rb
+++ b/app/controllers/admin/api_users_controller.rb
@@ -8,7 +8,8 @@ class Admin::ApiUsersController < AdminController
   end
 
   def new
-    @api_user = ApiUser.new
+    @registrar = Registrar.find_by(id: params[:registrar_id])
+    @api_user = ApiUser.new(registrar: @registrar)
   end
 
   def create
diff --git a/app/views/admin/api_users/show.haml b/app/views/admin/api_users/show.haml
index 1b855eeba..112dce676 100644
--- a/app/views/admin/api_users/show.haml
+++ b/app/views/admin/api_users/show.haml
@@ -1,6 +1,6 @@
 - content_for :actions do
   = link_to(t(:edit), edit_admin_api_user_path(@api_user), class: 'btn btn-primary')
-  = link_to(t(:delete), admin_api_user_path(@api_user), 
+  = link_to(t(:delete), admin_api_user_path(@api_user),
     method: :delete, data: { confirm: t(:are_you_sure) }, class: 'btn btn-danger')
 = render 'shared/title', name: @api_user.username
 
@@ -23,6 +23,9 @@
           %dt= t(:password)
           %dd= @api_user.password
 
+          %dt= t(:registrar)
+          %dd= link_to(@api_user.registrar, admin_registrar_path(@api_user.registrar))
+
           %dt= t(:active)
           %dd= @api_user.active
 .row
@@ -32,7 +35,7 @@
         .pull-left
           = t(:certificates)
         .pull-right
-          = link_to(t(:upload_csr), 
+          = link_to(t(:upload_csr),
             new_admin_api_user_certificate_path(@api_user), class: 'btn btn-primary btn-xs')
 
       .table-responsive
diff --git a/app/views/admin/registrars/show.haml b/app/views/admin/registrars/show.haml
index b6bda7f42..17699cd90 100644
--- a/app/views/admin/registrars/show.haml
+++ b/app/views/admin/registrars/show.haml
@@ -1,6 +1,6 @@
 - content_for :actions do
   = link_to(t(:edit), edit_admin_registrar_path(@registrar), class: 'btn btn-primary')
-  = link_to(t(:delete), admin_registrar_path(@registrar), 
+  = link_to(t(:delete), admin_registrar_path(@registrar),
     method: :delete, data: { confirm: t(:are_you_sure) }, class: 'btn btn-danger')
 = render 'shared/title', name: @registrar.name
 
@@ -57,7 +57,11 @@
   .col-md-12
     #epp-users.panel.panel-default
       .panel-heading.clearfix
-        = t(:api_users)
+        .pull-left
+          = t(:api_users)
+        .pull-right
+          = link_to(t('create_new_api_user'), new_admin_registrar_api_user_path(@registrar), class: 'btn btn-primary btn-xs')
+
       .table-responsive
         %table.table.table-hover.table-bordered.table-condensed
           %thead
diff --git a/config/routes.rb b/config/routes.rb
index aa3e96965..276e07198 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -107,6 +107,7 @@ Rails.application.routes.draw do
 
     resources :settings
     resources :registrars do
+      resources :api_users
       collection do
         get :search
       end