diff --git a/.haml-lint_todo.yml b/.haml-lint_todo.yml
index 2e4c2995..25ccb622 100644
--- a/.haml-lint_todo.yml
+++ b/.haml-lint_todo.yml
@@ -78,6 +78,7 @@ linters:
       - "app/views/admin/resources/show.html.haml"
       - "app/views/admin/roles/_form.html.haml"
       - "app/views/admin/roles/_users.html.haml"
+      - "app/views/admin/roles/_users_with_org_admin_role.haml"
       - "app/views/admin/roles/index.html.haml"
       - "app/views/admin/roles/show.html.haml"
       - "app/views/admin/rooms/_form.html.haml"
diff --git a/app/views/admin/organizations/_users_with_org_admin_role.haml b/app/views/admin/organizations/_users_with_org_admin_role.haml
new file mode 100644
index 00000000..e107868c
--- /dev/null
+++ b/app/views/admin/organizations/_users_with_org_admin_role.haml
@@ -0,0 +1,25 @@
+.page-header
+  %h3 Users (#{users.length})
+- if users.present?
+  %table.table.table-striped.table-bordered.table-hover.datatable#users
+    %thead
+      %th Name
+      %th Email
+      - if ( can? :unassign_org_admins, organization )
+        %th
+          Actions
+    %tbody
+      - users.each do |user|
+        %tr
+          %td= user.name
+          %td= user.email
+          - if ( can? :unassign_org_admins, organization )
+            %td
+              = link_to 'Remove from organization admin',
+                unassign_org_admins_admin_organization_path(organization.id,
+                role.name,
+                user: {email: user.email}),
+                method: :delete,
+                class: 'btn btn-danger'
+- else
+  %h5 No users found!
diff --git a/app/views/admin/organizations/index.html.haml b/app/views/admin/organizations/index.html.haml
index aa682c57..baf9bc80 100644
--- a/app/views/admin/organizations/index.html.haml
+++ b/app/views/admin/organizations/index.html.haml
@@ -25,6 +25,8 @@
               = organization.conferences.past.count
             %td
               .btn-group
+                = link_to 'Admins', admins_admin_organization_path(organization),
+                  method: :get, class: 'btn btn-success'
                 = link_to 'Edit', edit_admin_organization_path(organization),
                   method: :get, class: 'btn btn-primary'
                 = link_to 'Delete', admin_organization_path(organization),
diff --git a/app/views/admin/organizations/show_org_admins.haml b/app/views/admin/organizations/show_org_admins.haml
new file mode 100644
index 00000000..7fe1f943
--- /dev/null
+++ b/app/views/admin/organizations/show_org_admins.haml
@@ -0,0 +1,24 @@
+.row
+  .col-md-12
+    .page-header
+      %h2
+        Organization admins for #{@organization.name}
+      .text-muted
+        = @role.description
+
+.row.col-md-3
+  - if ( can? :assign_org_admins, @organization )
+    = semantic_form_for :user,
+      url: assign_org_admins_admin_organization_path(@organization,
+      @role.name), method: :post do |u|
+
+      = u.label 'Add user by email: '
+      .input-group
+        = u.input :email, label: false, placeholder: "User's email"
+        .input-group-btn
+          = u.submit 'Add', id: 'user-add', class: 'btn btn-primary'
+
+.row
+  .col-md-12
+    = render partial: 'users_with_org_admin_role',
+      locals: { users: @users, organization: @organization, role: @role }
diff --git a/config/routes.rb b/config/routes.rb
index 523a076d..3b955953 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -20,7 +20,13 @@ Osem::Application.routes.draw do
   end
 
   namespace :admin do
-    resources :organizations
+    resources :organizations do
+      member do
+        get :admins
+        post :assign_org_admins
+        delete :unassign_org_admins
+      end
+    end
     resources :users do
       member do
         patch :toggle_confirmation