diff --git a/app/assets/javascripts/assister_role.js b/app/assets/javascripts/assister_role.js
index dd8b67e4e99..3cb711c79c7 100644
--- a/app/assets/javascripts/assister_role.js
+++ b/app/assets/javascripts/assister_role.js
@@ -30,28 +30,8 @@ function selectAssisterAgency(element) {
   document.getElementById('assister-staff-btn').disabled = false;
 }
 
-$(document).on('click', 'a.select-assister-agency', function () {
+$(document).on('click', 'select-assister-agency', function () {
   if ($('.table-responsive').length) {
     $('.assister-agency-submit').removeClass('hidden');
   }
 });
-
-function allowAssisterAgencyFormSubmission() {
-  var assister_attestation_fields = document.getElementsByClassName('assister-attestation-field');
-  var form_button = document.getElementById('assister-btn');
-  if (
-    Array.from(assister_attestation_fields).every(
-      (form_element) => form_element.checked == true
-    ) == true
-  ) {
-    form_button.disabled = false;
-  } else {
-    form_button.disabled = true;
-  }
-}
-
-$(function () {
-  $('.assister-attestation-field').on('change', function () {
-    allowAssisterAgencyFormSubmission();
-  });
-});
\ No newline at end of file
diff --git a/app/assets/javascripts/help_me_sign_up.js b/app/assets/javascripts/help_me_sign_up.js
index 654b6b64577..1ba2ec08715 100644
--- a/app/assets/javascripts/help_me_sign_up.js
+++ b/app/assets/javascripts/help_me_sign_up.js
@@ -1,71 +1,154 @@
-$(document).on('click', '#search_for_plan_shopping_help', function() {
-  $.ajax({
-    type: 'GET',
-    data: {firstname: $('#help_first_name').val(), lastname: $('#help_last_name').val(), type: $('#help_type').html(),
-           person: $('#help_requestor').html(), email: $('#help_requestor_email').html(),
-           first_name: $('#person_first_name').val(), last_name: $('#person_last_name').val(),
-           ssn: $('#person_ssn').val(), dob: $('#jq_datepicker_ignore_person_dob').val()
-         },
-    url: '/exchanges/hbx_profiles/request_help.html?',
-  }).done(function(response) {
-    $('#help_status').html(JSON.parse(response)['status'])
+(function ($) {
+  var REQUEST_HELP = '/exchanges/hbx_profiles/request_help.html?';
+
+  /** Shared GET fields for request_help (vanilla DOM reads match prior jQuery .val() / .html()). */
+  function personPayload() {
+    function val(id) {
+      var el = document.getElementById(id);
+      return el ? el.value : '';
+    }
+    function html(id) {
+      var el = document.getElementById(id);
+      return el ? el.innerHTML : '';
+    }
+    return {
+      person: html('help_requestor'),
+      email: html('help_requestor_email'),
+      first_name: val('person_first_name'),
+      last_name: val('person_last_name'),
+      ssn: val('person_ssn'),
+      dob: val('jq_datepicker_ignore_person_dob')
+    };
+  }
+
+  function personPayloadSearchParams(extraPairs) {
+    var p = new URLSearchParams();
+    if (extraPairs) {
+      for (var i = 0; i < extraPairs.length; i++) {
+        p.set(extraPairs[i][0], extraPairs[i][1]);
+      }
+    }
+    var fields = personPayload();
+    Object.keys(fields).forEach(function (key) {
+      p.set(key, fields[key]);
+    });
+    return p;
+  }
+
+  $(document).on('click', '#search_for_plan_shopping_help', function () {
+    $.ajax({
+      type: 'GET',
+      data: $.extend(
+        {
+          firstname: $('#help_first_name').val(),
+          lastname: $('#help_last_name').val(),
+          type: $('#help_type').html()
+        },
+        personPayload()
+      ),
+      url: REQUEST_HELP
+    }).done(function (response) {
+      $('#help_status').html(JSON.parse(response).status);
+    });
+  });
+
+  $(document).on('click', '.help_button', function () {
+    $.ajax({
+      type: 'GET',
+      data: $.extend(
+        {
+          assister: this.getAttribute('data-assister'),
+          broker: this.getAttribute('data-broker')
+        },
+        personPayload()
+      ),
+      url: REQUEST_HELP
+    }).done(function (response) {
+      var parsed = JSON.parse(response);
+      $('#help_index_status').html(parsed.status).removeClass('hide');
+      $('#consumer_brokers_widget').html(parsed.broker);
+    });
+  });
+
+  $(document).on('click', '.name_search_only', function () {
+    $('#help_list').addClass('hide');
+    $('#help_search').removeClass('hide');
+    $('#help_type').html(this.id);
+    $('#back_to_help').removeClass('hide');
   });
-})
 
-$(document).on('click', '.help_button', function(){
-$.ajax({
-    type: 'GET',
-    data: {assister: this.getAttribute('data-assister'), broker: this.getAttribute('data-broker'),
-           person: $('#help_requestor').html(), email: $('#help_requestor_email').html(),
-           first_name: $('#person_first_name').val(), last_name: $('#person_last_name').val(),
-           ssn: $('#person_ssn').val(), dob: $('#jq_datepicker_ignore_person_dob').val()
-         },
-    url: '/exchanges/hbx_profiles/request_help.html?',
-  }).done(function(response) {
-    broker_status = JSON.parse(response)
-    var status = broker_status['status']
-    var broker = broker_status['broker']
-    $('#help_index_status').html(status).removeClass('hide')
-    $('#consumer_brokers_widget').html(broker)
+  $(document).on('click', '[data-target="#help_with_plan_shopping"]', function () {
+    $('.help_reset').addClass('hide');
+    $('#help_list').removeClass('hide');
+    $('#back_to_help').addClass('hide');
+    $('#bottom_expert_link').removeClass('hide');
+    $('#bottom_expert_assister_link').removeClass('hide');
   });
-})
 
-$(document).on('click', '.name_search_only', function() {
-  $('#help_list').addClass('hide')
-  $('#help_search').removeClass('hide')
-  $('#help_type').html(this.id)
-  $('#back_to_help').removeClass('hide')
-})
-$(document).on('click', '[data-target="#help_with_plan_shopping"]',function(){$('.help_reset').addClass("hide"); $('#help_list').removeClass("hide"); $('#back_to_help').addClass("hide"); $('#bottom_expert_link').removeClass("hide"); $('#bottom_expert_assister_link').removeClass("hide") })
+  $(document).on('click', '#back_to_help', function () {
+    $('.help_reset').addClass('hide');
+    $('#back_to_help').addClass('hide');
+    $('#help_list').removeClass('hide');
+    $('#help_status').html('');
+    $('#help_sign_up_title').removeClass('hide');
+    $('#help_from_expert_title').addClass('hide');
+  });
+
+  function applyMyExpertSuccess(helperType, status) {
+    var form = document.getElementById('inbox_provider_form');
+    if (form) form.style.display = 'none';
+
+    var tab = document.querySelector('#active_' + helperType + '_tab');
+    if (!tab) return;
+
+    var alertEl = tab.querySelector('.alert');
+    if (alertEl) {
+      alertEl.classList.remove('alert-warning');
+      alertEl.classList.add('alert-success');
+    }
+    var iconEl = tab.querySelector('.icon');
+    if (iconEl) {
+      iconEl.classList.remove('warning-icon');
+      iconEl.classList.add('success-icon');
+    }
+    var bodyEl = tab.querySelector('.warning-body');
+    if (bodyEl) bodyEl.textContent = status;
+
+    document.querySelectorAll('a.go-to-expert, button').forEach(function (el) {
+      el.classList.remove('hidden');
+      el.classList.remove('hide');
+    });
+    tab.querySelectorAll('button').forEach(function (el) {
+      el.classList.add('hide');
+    });
+  }
+
+  document.addEventListener('click', function (event) {
+    var trigger = event.target.closest('.select-broker, .select-assister');
+    if (!trigger) return;
+
+    var disableSelector = trigger.classList.contains('select-assister') ? '.select-assister' : '.select-broker';
+    document.querySelectorAll(disableSelector).forEach(function (el) {
+      el.classList.add('disabled');
+    });
 
-$(document).on('click', '#back_to_help', function(){
-  $('.help_reset').addClass("hide");
-  $("#back_to_help").addClass('hide');
-  $('#help_list').removeClass("hide");
-  $('#help_status').html('')
-  $('#help_sign_up_title').removeClass('hide');
-  $('#help_from_expert_title').addClass('hide');
-})
+    var helperType = trigger.getAttribute('data-assister') ? 'assister' : 'broker';
+    var query = personPayloadSearchParams([
+      ['my_expert', 'true'],
+      ['assister', trigger.getAttribute('data-assister') || ''],
+      ['broker', trigger.getAttribute('data-broker') || '']
+    ]);
 
-$(document).on('click', '.select-broker', function(){
-  $('.select-broker').addClass('disabled');
-  var helper_type = this.getAttribute('data-assister') ? "assister" : "broker";
-  $.ajax({
-    type: 'GET',
-    data: {assister: this.getAttribute('data-assister'), broker: this.getAttribute('data-broker'),
-            person: $('#help_requestor').html(), email: $('#help_requestor_email').html(),
-            first_name: $('#person_first_name').val(), last_name: $('#person_last_name').val(),
-            ssn: $('#person_ssn').val(), dob: $('#jq_datepicker_ignore_person_dob').val()
-          },
-    url: '/exchanges/hbx_profiles/request_help.html?my_expert=true',
-  }).done(function(response) {
-    broker_status = JSON.parse(response);
-    var status = broker_status['status']
-    $('#inbox_provider_form').hide();
-    $('#active_'+helper_type+'_tab .alert').removeClass('alert-warning').addClass('alert-success')
-    $('#active_'+helper_type+'_tab .icon').removeClass('warning-icon').addClass('success-icon')
-    $('#active_'+helper_type+'_tab .warning-body').text(status)
-    $('a.go-to-expert, button').removeClass('hidden').removeClass('hide');
-    $("#active_"+helper_type+"_tab button").addClass('hide')
+    fetch(REQUEST_HELP + query.toString(), {
+      method: 'GET',
+      headers: { 'X-Requested-With': 'XMLHttpRequest' },
+      credentials: 'same-origin'
+    })
+      .then(function (response) {
+        return response.text();
+      })
+      .then(function (responseText) {
+        applyMyExpertSuccess(helperType, JSON.parse(responseText).status);
+      });
   });
-})
+})(jQuery);
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 90456b92810..38d19bb9e14 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -201,11 +201,11 @@ def broker_match?(user_person, writing_agent_id)
   def assister_match?(user_person, assister_agency_account)
     return false if assister_agency_account.blank?
 
-    writing_agent_id = assister_agency_account.writing_agent_id
-    return false if writing_agent_id.blank?
+    profile_id = assister_agency_account.benefit_sponsors_assister_agency_profile_id
+    return false if profile_id.blank?
 
-    user_person.assister_role&.active? &&
-      user_person.assister_role.id == writing_agent_id
+    user_person.assister_role&.active? && user_person.assister_role.benefit_sponsors_assister_agency_profile_id == profile_id ||
+      (user_person.assister_agency_staff_roles.active.any? { |staff| staff.benefit_sponsors_assister_agency_profile_id == profile_id })
   end
 
   def redirect_if_prod
diff --git a/app/controllers/exchanges/hbx_profiles_controller.rb b/app/controllers/exchanges/hbx_profiles_controller.rb
index 96b90dd8967..09eb1ed3597 100644
--- a/app/controllers/exchanges/hbx_profiles_controller.rb
+++ b/app/controllers/exchanges/hbx_profiles_controller.rb
@@ -339,7 +339,7 @@ def request_help
       assister_role_id = agent.assister_role.id
       consumer = Person.find(params[:person])
       family = consumer.primary_family
-      authorize family, :hire_broker_agency?
+      authorize family, :hire_assister_agency?
       family.hire_assister_agency(assister_role_id)
       role = l10n("assister")
     end
diff --git a/app/controllers/insured/families_controller.rb b/app/controllers/insured/families_controller.rb
index abf7e8b1a25..b20885a1dea 100644
--- a/app/controllers/insured/families_controller.rb
+++ b/app/controllers/insured/families_controller.rb
@@ -525,11 +525,17 @@ def delete_consumer_broker
     else
       redirect_to :action => "home", flash: {notice: "Unable to remove expert from this account"}
     end
+  rescue Pundit::NotAuthorizedError
+    redirect_back(
+      fallback_location: { action: "home" },
+      allow_other_host: false,
+      flash: { error: l10n("not_authorized") }
+    )
   end
 
   def delete_consumer_assister
     @family = Family.find(params[:id])
-    authorize @family, :delete_consumer_broker?
+    authorize @family, :delete_consumer_assister?
 
     assister_agency = @family&.current_assister_agency
 
@@ -539,6 +545,12 @@ def delete_consumer_assister
     else
       redirect_to :action => "home", flash: {notice: "Unable to remove expert from this account"}
     end
+  rescue Pundit::NotAuthorizedError
+    redirect_back(
+      fallback_location: { action: "home" },
+      allow_other_host: false,
+      flash: { error: l10n("not_authorized") }
+    )
   end
 
   def transition_family_members
diff --git a/app/data_migrations/permissions/dc_define_permissions.rb b/app/data_migrations/permissions/dc_define_permissions.rb
index 396a9a814ee..458160ddc58 100644
--- a/app/data_migrations/permissions/dc_define_permissions.rb
+++ b/app/data_migrations/permissions/dc_define_permissions.rb
@@ -394,5 +394,14 @@ def hbx_admin_can_edit_notice_templates
     Permission.hbx_staff.update_attributes!(can_edit_notice_templates: true)
     Permission.hbx_tier3.update_attributes!(can_edit_notice_templates: true)
   end
+
+  def hbx_admin_can_create_assister_agency
+    Permission.hbx_staff.update_attributes!(can_create_assister_agency: true)
+    Permission.super_admin.update_attributes!(can_create_assister_agency: true)
+    Permission.hbx_tier3.update_attributes!(can_create_assister_agency: false)
+    Permission.hbx_csr_supervisor.update_attributes!(can_create_assister_agency: false)
+    Permission.hbx_csr_tier1.update_attributes!(can_create_assister_agency: false)
+    Permission.hbx_csr_tier2.update_attributes!(can_create_assister_agency: false)
+  end
 end
 # rubocop:enable Metrics/ClassLength
diff --git a/app/data_migrations/permissions/me_define_permissions.rb b/app/data_migrations/permissions/me_define_permissions.rb
index 32aa4b08e94..25d84cd79c2 100644
--- a/app/data_migrations/permissions/me_define_permissions.rb
+++ b/app/data_migrations/permissions/me_define_permissions.rb
@@ -438,6 +438,15 @@ def hbx_admin_can_reprint_tax_documents
     Permission.hbx_read_only.update_attributes!(can_reprint_tax_documents: false)
   end
 
+  def hbx_admin_can_create_assister_agency
+    Permission.hbx_staff.update_attributes!(can_create_assister_agency: true)
+    Permission.super_admin.update_attributes!(can_create_assister_agency: true)
+    Permission.hbx_tier3.update_attributes!(can_create_assister_agency: false)
+    Permission.hbx_csr_supervisor.update_attributes!(can_create_assister_agency: false)
+    Permission.hbx_csr_tier1.update_attributes!(can_create_assister_agency: false)
+    Permission.hbx_csr_tier2.update_attributes!(can_create_assister_agency: false)
+  end
+
   def hbx_admin_can_view_notice_templates
     Permission.super_admin.update_attributes!(can_view_notice_templates: true)
     Permission.hbx_staff.update_attributes!(can_view_notice_templates: true)
diff --git a/app/models/permission.rb b/app/models/permission.rb
index 1a47def4ed0..c54921b75f9 100644
--- a/app/models/permission.rb
+++ b/app/models/permission.rb
@@ -68,6 +68,7 @@ class Permission
   field :can_edit_notice_templates, type: Boolean, default: false
   field :can_view_audit_log, type: Boolean, default: false
   field :can_reprint_tax_documents, type: Boolean, default: false
+  field :can_create_assister_agency, type: Boolean, default: false
 
   class << self
     def hbx_staff
diff --git a/app/policies/application_policy.rb b/app/policies/application_policy.rb
index e90786cb25a..e5b4203665e 100644
--- a/app/policies/application_policy.rb
+++ b/app/policies/application_policy.rb
@@ -216,8 +216,7 @@ def active_associated_individual_market_family_assister?
     assister_agency_account = family&.active_assister_agency_account
     return false if assister_agency_account.blank?
 
-    assister_agency_account.benefit_sponsors_assister_agency_profile_id == assister.benefit_sponsors_assister_agency_profile_id &&
-      assister_agency_account.writing_agent_id == assister.id
+    assister_agency_account.benefit_sponsors_assister_agency_profile_id == assister.benefit_sponsors_assister_agency_profile_id
   end
 
   # Determines if the current user is an admin in the individual market.
@@ -282,8 +281,7 @@ def active_associated_coverall_market_family_assister?
     assister_agency_account = family.active_assister_agency_account
     return false if assister_agency_account.blank?
 
-    assister_agency_account.benefit_sponsors_assister_agency_profile_id == assister.benefit_sponsors_assister_agency_profile_id &&
-      assister_agency_account.writing_agent_id == assister.id
+    assister_agency_account.benefit_sponsors_assister_agency_profile_id == assister.benefit_sponsors_assister_agency_profile_id
   end
 
   # Checks if the account holder is an admin in the coverall market.
diff --git a/app/policies/family_policy.rb b/app/policies/family_policy.rb
index 2dd441b2929..ccbadbb5047 100644
--- a/app/policies/family_policy.rb
+++ b/app/policies/family_policy.rb
@@ -262,6 +262,7 @@ def delete_consumer_broker?
 
   def delete_consumer_assister?
     return true if individual_market_primary_family_member?
+    return true if individual_market_non_ridp_primary_family_member?
     return true if individual_market_admin?
 
     return true if shop_market_primary_family_member?
diff --git a/app/views/exchanges/bulk_notices/preview.html.erb b/app/views/exchanges/bulk_notices/preview.html.erb
index ec1c7741a0e..b42482f0341 100644
--- a/app/views/exchanges/bulk_notices/preview.html.erb
+++ b/app/views/exchanges/bulk_notices/preview.html.erb
@@ -66,7 +66,7 @@
     <strong>Important:</strong> <p><%= l10n("admin_actions.bulk_upload.new.description_sub_text") %></p>
 
     <%= form_for(@bulk_notice, url: exchanges_bulk_notice_path(@bulk_notice)) do |f| %>
-      <%= f.select :audience_type, { 'Broker Agency' => :broker_agency, 'Assister Agency' => :assister_agency, 'Employer' => :employer, 'General Agency' => :general_agency, 'Employee' => :employee }, { selected: @bulk_notice.audience_type }, class: 'form-control col-2', data: { reflex: 'change->BulkNotice#audience_select' } %>
+      <%= f.select :audience_type, { 'Broker Agency' => :broker_agency, 'Assister Organization' => :assister_agency, 'Employer' => :employer, 'General Agency' => :general_agency, 'Employee' => :employee }, { selected: @bulk_notice.audience_type }, class: 'form-control col-2', data: { reflex: 'change->BulkNotice#audience_select' } %>
       <table class='table table-message-wrapper'>
         <tbody>
           <tr>
diff --git a/app/views/insured/families/_consumer_assister.html.erb b/app/views/insured/families/_consumer_assister.html.erb
index 9210145484b..7ef6bd89ccb 100644
--- a/app/views/insured/families/_consumer_assister.html.erb
+++ b/app/views/insured/families/_consumer_assister.html.erb
@@ -1,31 +1,30 @@
 <% if @bs4 %>
-  <% writing_agent = @person&.primary_family&.current_assister_agency&.writing_agent %>
+  <% writing_agent = @person&.primary_family&.current_assister_agency&.coordinator %>
   <div class="d-flex justify-content-between mb-4">
     <div class="d-flex align-items-center">
       <svg width="26" height="26" viewBox="0 0 26 26" fill="none" xmlns="http://www.w3.org/2000/svg" class="primary-text">
         <title><%= l10n('my_assister') %></title>
         <path d="M3.3111 15.4941L10.6566 15.4938C10.2201 16.0222 9.93855 16.6832 9.88136 17.4073L9.87057 17.6817V23.3067C9.87057 24.1379 10.1656 24.9002 10.6566 25.4946L10.4956 25.4956C6.21936 25.4956 3.06566 24.1554 1.13796 21.4499C0.723007 20.8676 0.5 20.1703 0.5 19.4552V18.3052C0.5 16.7527 1.75857 15.4941 3.3111 15.4941ZM16.4331 12.3692H20.1831C20.9921 12.3692 21.6575 12.9841 21.7375 13.772L21.7456 13.9317L21.745 15.4937L23.3081 15.4942C24.5162 15.4942 25.4956 16.4736 25.4956 17.6817V23.3067C25.4956 24.5148 24.5162 25.4942 23.3081 25.4942H13.3081C12.0999 25.4942 11.1206 24.5148 11.1206 23.3067V17.6817C11.1206 16.4736 12.0999 15.4942 13.3081 15.4942L14.87 15.4937L14.8706 13.9317C14.8706 13.1227 15.4854 12.4573 16.2733 12.3773L16.4331 12.3692H20.1831H16.4331ZM19.8706 14.2442H16.7456L16.745 15.4937H19.87L19.8706 14.2442ZM10.4956 0.5C13.9474 0.5 16.7456 3.29822 16.7456 6.75C16.7456 10.2018 13.9474 13 10.4956 13C7.04379 13 4.24557 10.2018 4.24557 6.75C4.24557 3.29822 7.04379 0.5 10.4956 0.5Z" fill="currentColor"/>
       </svg>
-      <h2 class="ml-2"><%= writing_agent&.person&.first_name&.capitalize %> <%= writing_agent&.person&.last_name&.capitalize %></h2>
+      <h2 class="ml-2"><%= @person.primary_family.current_assister_agency.assister_agency_profile.legal_name.titleize %></h2>
     </div>
-    <a href="#destroyAssister" data-toggle="modal" data-target="#destroyAssister" class="button outline error"><%= l10n("insured.assisters.remove_assister") %></a>
+    <a href="#destroyAssister" data-toggle="modal" data-target="#destroyAssister" class="button outline error"><%= l10n("remove_expert") %></a>
   </div>
   <div class="d-flex md-col-6 pl-0">
-    <div class="col-6 pl-0">
+    <div class="col-3 pl-0 mr-3">
       <dl class="parent">
-        <dt><%= l10n("insured.assisters.agency") %>:</dt>
-        <dd><%= @person.primary_family.current_assister_agency.assister_agency_profile.legal_name.titleize %></dd>
-        <dt><%= l10n("insured.assisters.assignment_date") %>:</dt>
-        <dd><% date = @person.primary_family.current_assister_agency.start_on.in_time_zone('Eastern Time (US & Canada)') %>
-          <%= format_date(date) %> <%= date.strftime("%-I:%M%p") %></dd>
+        <dt><%= l10n("phone") %>:</dt>
+        <dd><%= writing_agent.phone %></dd>
+        <dt><%= l10n("email") %>:</dt>
+        <dd><%= writing_agent.email&.address %></dd>
+      </dl>
       </dl>
     </div>
-    <div class="col-6 pr-0">
+    <div class="col-9 pr-0">
       <dl class="parent">
-        <dt><%= l10n("phone") %>:</dt>
-        <dd><%= @person.primary_family.current_assister_agency.writing_agent.phone %></dd>
-        <dt><%= l10n("email") %>:</dt>
-        <dd><%= @person.primary_family.current_assister_agency.writing_agent.email.address %></dd>
+        <dt><%= l10n("insured.assisters.assignment_date") %>:</dt>
+        <dd><% date = @person.primary_family.current_assister_agency.start_on.in_time_zone('Eastern Time (US & Canada)') %>
+          <%= format_date(date) %> <%= date.strftime("%-I:%M%p") %></dd>
       </dl>
     </div>
   </div>
@@ -51,7 +50,7 @@
         </div>
         <div class="d-flex align-items-center mt-4 justify-content-end">
           <button type="button" class="btn outline modal-cancel-button mr-1" data-dismiss="modal"><%= l10n("cancel") %></button>
-          <%= h(link_to(l10n("insured.assisters.removal_confirm"), delete_consumer_assister_insured_family_path(@family), method: :delete, class: 'button'+ pundit_class(Family,:updateable?))) %>
+          <%= h(link_to(l10n("insured.assisters.removal_confirm"), delete_consumer_assister_insured_family_path(@family), method: :delete, class: 'button'+ pundit_class(Family,:updateable?), data: { cuke: "confirm-remove-assister" })) %>
         </div>
       </div>
     </div>
diff --git a/app/views/insured/families/_consumer_broker.html.erb b/app/views/insured/families/_consumer_broker.html.erb
index 33bc62c4f33..7b07e212dd6 100644
--- a/app/views/insured/families/_consumer_broker.html.erb
+++ b/app/views/insured/families/_consumer_broker.html.erb
@@ -8,7 +8,7 @@
       </svg>
       <h2 class="ml-2"><%= writing_agent&.person&.first_name&.capitalize %> <%= writing_agent&.person&.last_name&.capitalize %></h2>
     </div>
-    <a href="#destroyBroker" data-toggle="modal" data-target="#destroyBroker" class="button outline error"><%= l10n("insured.brokers.remove_broker") %></a>
+    <a href="#destroyBroker" data-toggle="modal" data-target="#destroyBroker" class="button outline error"><%= l10n("remove_expert") %></a>
   </div>
   <div class="d-flex md-col-6 pl-0">
     <div class="col-6 pl-0">
@@ -53,7 +53,7 @@
         </div>
         <div class="d-flex align-items-center mt-4 justify-content-end">
           <button type="button" class="btn outline modal-cancel-button mr-1" data-dismiss="modal"><%= l10n("cancel") %></button>
-          <%= h(link_to(l10n("insured.brokers.removal_confirm"), delete_consumer_broker_insured_family_path(@family), method: :delete, class: 'button'+ pundit_class(Family,:updateable?))) %>
+          <%= h(link_to(l10n("insured.brokers.removal_confirm"), delete_consumer_broker_insured_family_path(@family), method: :delete, class: 'button'+ pundit_class(Family,:updateable?), data: { cuke: "confirm-remove-broker" })) %>
         </div>
       </div>
     </div>
diff --git a/app/views/insured/families/brokers.html.erb b/app/views/insured/families/brokers.html.erb
index ca8f72d7a18..148e96cbaae 100644
--- a/app/views/insured/families/brokers.html.erb
+++ b/app/views/insured/families/brokers.html.erb
@@ -8,21 +8,31 @@
     </section>
   <% else %>
     <% has_broker = @person&.primary_family&.current_broker_agency&.writing_agent %>
-    <% has_assister = @person&.primary_family&.current_assister_agency&.writing_agent %>
+    <% has_assister = @person&.primary_family&.current_assister_agency %>
     <% page_title = (has_broker && has_assister) ? l10n('my_experts') : l10n('my_expert')%>
     <h1><%= page_title %></h1>
-    <section class="rounded-lg bg-white border p-3 my-4 col-9">
-      <% if @person.has_active_employee_role? && has_writing_agent?(@employee_role) %>
+    <% if @person.has_active_employee_role? && has_writing_agent?(@employee_role) %>
+      <section class="rounded-lg bg-white border p-3 my-4 col-9">
         <%= render 'employee_broker', title: nil %>
-      <% elsif @person.has_consumer_role? %>
-        <% if @person&.primary_family&.current_broker_agency&.writing_agent %>
-          <%= render 'consumer_broker', title: nil %>
-        <% end %>
-        <% if @person&.primary_family&.current_assister_agency&.writing_agent %>
-          <%= render 'consumer_assister', title: nil %>
-        <% end %>
+      </section>
+    <% elsif @person.has_consumer_role? %>
+      <% if @person&.primary_family&.current_broker_agency&.writing_agent %>
+        <section class="my-4" data-cuke="broker-details">
+          <% if has_broker && has_assister %><h2 data-cuke="broker-subtitle"><%= l10n("broker") %></h2><% end %>
+          <div class="rounded-lg bg-white border p-3 col-9">
+            <%= render 'consumer_broker', title: nil %>
+          </div>
+        </section>
       <% end %>
-    </section>
+      <% if @person&.primary_family&.current_assister_agency&.writing_agent %>
+        <section class="my-4" data-cuke="assister-details">
+          <% if has_broker && has_assister %><h2 data-cuke="assister-subtitle"><%= l10n("assister") %></h2><% end %>
+          <div class="rounded-lg bg-white border p-3 col-9">
+            <%= render 'consumer_assister', title: nil %>
+          </div>
+        </section>
+      <% end %>
+    <% end %>
   <% end %>
 
   <% if assister_agency_is_enabled? && (!has_broker || !has_assister) %>
@@ -31,15 +41,14 @@
     <a href="#help_with_plan_shopping"
        tabindex="0"
        id="help_me_sign_up"
-       class="button mt-4 help-me-sign-up"
+       class="button mt-4 help-me-sign-up mr-2"
        data-target="#help_with_plan_shopping"
+       data-cuke="select-expert-button"
        data-toggle="modal">
       <%= l10n(button_text_key) %>
     </a>
 
     <%= render partial: './ui-components/v1/modals/help_with_plan_in_my_expert'%>
-
-    &nbsp;&nbsp;&nbsp;
   <% end %>
 
   <a href="<%= main_app.family_account_path(tab: 'home') %>" class="button mt-4">
diff --git a/app/views/shared/assisters/_assister_fields.html.erb b/app/views/shared/assisters/_assister_fields.html.erb
index 568f1d9bd35..4531e165e4c 100644
--- a/app/views/shared/assisters/_assister_fields.html.erb
+++ b/app/views/shared/assisters/_assister_fields.html.erb
@@ -39,10 +39,6 @@
 <section class="my-3">
   <%= f.fields_for :assister_role do |assister_role_fields| %>
     <% disabled = assister_or_staff_role.active? ? true : false %>
-    <label for="training" class="d-flex align-items-center">
-      <%= assister_role_fields.check_box :training, id: "training" %>
-      <span class="ml-1"><%= l10n("training") %></span>
-    </label>
     <label for="reason" class="mt-3">Reason</label>
     <%= assister_role_fields.text_area :reason, placeholder: "#{l10n('write_here')}...", rows: 6, disabled: disabled, id: "reason", class:"w-100" %>
   <% end %>
diff --git a/app/views/ui-components/bs4/v1/forms/assister/_attestation_agreement_fields.html.erb b/app/views/ui-components/bs4/v1/forms/assister/_attestation_agreement_fields.html.erb
deleted file mode 100644
index ba2da941f32..00000000000
--- a/app/views/ui-components/bs4/v1/forms/assister/_attestation_agreement_fields.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<h2 class='mb-3'><%= l10n("agreements") %></h2>
-
-<div class="form-group mt-0 d-flex align-items-center">
-  <%= check_box_tag :all_marketplace_required_trainings, nil, false, class: "assister-attestation-field" %>
-  <label for="<%= :all_marketplace_required_trainings %>" class="mt-0 ml-1 font-weight-normal text-body">
-    <%= h(l10n("assister_attestation.required_trainings", trainings_link: 'https://coverme.inquisiqlms.com/', site_short_name: EnrollRegistry[:enroll_app].setting(:short_name).item)) %>
-  </label>
-</div>
\ No newline at end of file
diff --git a/app/views/ui-components/v1/modals/_help_with_plan.html.erb b/app/views/ui-components/v1/modals/_help_with_plan.html.erb
index a4f68fe152d..35e10e41e07 100644
--- a/app/views/ui-components/v1/modals/_help_with_plan.html.erb
+++ b/app/views/ui-components/v1/modals/_help_with_plan.html.erb
@@ -67,7 +67,11 @@
           <% if assister_agency_is_enabled? %>
             <%= h(link_to l10n("assister_agencies.assister"), benefit_sponsors.staff_index_profiles_assister_agencies_assister_agency_profiles_path(bs4: @bs4), remote: true, class: "expert_link button", id: "bottom_expert_assister_link") %>
           <% end %>
-          <%= h(link_to l10n("insured.assign_an_expert"), benefit_sponsors.staff_index_profiles_broker_agencies_broker_agency_profiles_path(bs4: @bs4), remote: true, class: "expert_link button", id: "bottom_expert_link") %>
+          <% if assister_agency_is_enabled? %>
+            <%= h(link_to l10n("broker_agencies.select_a_broker"), benefit_sponsors.staff_index_profiles_broker_agencies_broker_agency_profiles_path(bs4: @bs4), remote: true, class: "expert_link button", id: "bottom_expert_link") %>
+          <% else %>
+            <%= h(link_to l10n("insured.assign_an_expert"), benefit_sponsors.staff_index_profiles_broker_agencies_broker_agency_profiles_path(bs4: @bs4), remote: true, class: "expert_link button", id: "bottom_expert_link") %>
+          <% end %>
         </div>
       </div>
     </div>
diff --git a/app/views/ui-components/v1/navs/_primary_nav.html.erb b/app/views/ui-components/v1/navs/_primary_nav.html.erb
index 7a0e5aac368..f3cc63db578 100644
--- a/app/views/ui-components/v1/navs/_primary_nav.html.erb
+++ b/app/views/ui-components/v1/navs/_primary_nav.html.erb
@@ -73,7 +73,8 @@
               <button class="dropdown-toggle unstyled" data-toggle="dropdown" id="assistersMenu">Assisters</button>
               <ul class="dropdown-menu" aria-labelledby="assistersMenu">
                 <%= render partial: 'exchanges/hbx_profiles/shared/nav_link', locals: {tab_name: 'assisters', link_path: main_app.exchanges_assister_applicants_path, display_name: 'Assister Applications', active_tab: "assisters", remote: false, pundit_object: nil, pundit_method: nil} %>
-                <%= render partial: 'exchanges/hbx_profiles/shared/nav_link', locals: {tab_name: 'assister-agencies', link_path: main_app.assister_agency_index_exchanges_hbx_profiles_path, display_name: 'Assister Agencies', active_tab: "assisters-agencies", remote: false, pundit_object: nil, pundit_method: nil} %>
+                <%= render partial: 'exchanges/hbx_profiles/shared/nav_link', locals: {tab_name: 'assister-agencies', link_path: main_app.assister_agency_index_exchanges_hbx_profiles_path, display_name: 'Assister Organizations', active_tab: "assisters-agencies", remote: false, pundit_object: nil, pundit_method: nil} %>
+                <%= render partial: 'exchanges/hbx_profiles/shared/nav_link', locals: {tab_name: 'assister-agencies-registration', link_path: benefit_sponsors.new_profiles_registration_path(:profile_type => :assister_agency), display_name: 'Assister Organization Registration', active_tab: "assister_registration", remote: false, pundit_object: nil, pundit_method: nil} %>
               </ul>
             </li>
             <% end %>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 47c9fe879c1..cf4c9b18a4e 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -30,6 +30,7 @@
         <%= link_to_with_noopener_noreferrer(l10n(".general_agency_portal"), benefit_sponsors.new_profiles_registration_path(:profile_type => :general_agency, portal: true), class: "btn btn-outline-primary mr-2 mb-2", data: { cuke: "general_agency_portal_link", turbolinks: "#{genesys_feature_enabled ? false : true}" }) %>
       <% end %>
       <% if assister_agency_is_enabled? %>
+        <%= link_to_with_noopener_noreferrer(l10n("welcome.index.assister_agency_registration"), benefit_sponsors.new_profiles_assister_agencies_assister_agency_staff_role_path, class: "btn btn-outline-primary mr-2 mb-2", data: { cuke: "assister_agency_registration_portal_link" }) %>
         <%= link_to_with_noopener_noreferrer(l10n("welcome.index.assister_agency_portal"), benefit_sponsors.new_profiles_registration_path(:profile_type => :assister_agency, portal: true), class: "btn btn-outline-primary mr-2 mb-2") %>
       <% end %>
       <%=  link_to_with_noopener_noreferrer(l10n(".hbx_portal"), exchanges_hbx_profiles_root_path, class: "btn btn-outline-primary mr-2 mb-2 hbx-portal", data: { cuke: "hbx_portal_link", turbolinks: "#{genesys_feature_enabled ? false : true}" } )%>
@@ -38,9 +39,6 @@
         <% if general_agency_enabled? %>
           <%= link_to_with_noopener_noreferrer(l10n("general_agency_registration"), benefit_sponsors.new_profiles_registration_path(:profile_type => :general_agency), class: "btn btn-outline-primary mr-2 mb-2", data: { cuke: "general_agency_registration_portal_link" }) %>
         <% end %>
-        <% if assister_agency_enabled? %>
-          <%= link_to_with_noopener_noreferrer(l10n("welcome.index.assister_agency_registration"), benefit_sponsors.new_profiles_registration_path(:profile_type => :assister_agency), class: "btn btn-outline-primary mr-2 mb-2") %>
-        <% end %>
       <% end %>
     </div>
   </div>
diff --git a/components/benefit_sponsors/app/controllers/benefit_sponsors/profiles/assister_agencies/assister_agency_profiles_controller.rb b/components/benefit_sponsors/app/controllers/benefit_sponsors/profiles/assister_agencies/assister_agency_profiles_controller.rb
index f90efd8b0e4..5abdb382927 100644
--- a/components/benefit_sponsors/app/controllers/benefit_sponsors/profiles/assister_agencies/assister_agency_profiles_controller.rb
+++ b/components/benefit_sponsors/app/controllers/benefit_sponsors/profiles/assister_agencies/assister_agency_profiles_controller.rb
@@ -46,30 +46,44 @@ def show
         def staff_index
           # a specific instance of BenefitSponsors::Organizations::AssisterAgencyProfile is not needed to test this endpoint
           authorize BenefitSponsors::Organizations::AssisterAgencyProfile
-          bs4 = params.permit(:bs4)[:bs4]
-          @bs4 = bs4 == "true" if bs4
-          @q = params.permit(:q)[:q]
+          permitted_params = params.permit(:utf8, :q, :bs4, :page)
+          @bs4 = permitted_params[:bs4]
+          @q = permitted_params[:q]
 
           @staff = eligible_assisters
+          @organizations = BenefitSponsors::Organizations::Organization.assister_agency_profiles.approved_assister_agencies.assister_agencies_by_market_kind(['both', person_market_kind])
           @page_alphabets = if EnrollRegistry.feature_enabled?(:bs4_consumer_flow)
-                              grouped_alphabet(@staff, "last_name")
+                              grouped_alphabet(@organizations, "legal_name")
                             else
-                              page_alphabets(@staff, "last_name")
+                              page_alphabets(@organizations, "legal_name")
                             end
           @alph_labels = @page_alphabets.map{|alph| [alph.first, alph.last].join("–")} if EnrollRegistry.feature_enabled?(:bs4_consumer_flow)
           page_no = cur_page_no(@page_alphabets.first)
-          @staff = if @q.nil?
-                     @staff.where(last_name: /^#{page_no}/i)
-                   elsif @q.blank?
-                     @staff.uniq.sort_by(&:last_name)
-                   else
-                     assister_profile_ids = BenefitSponsors::Organizations::Organization.where(legal_name: /^#{Regexp.escape(@q)}/i).map(&:profiles).flatten.map(&:id)
-                     find_by_agency_name = @staff.where(:'assister_role.benefit_sponsors_assister_agency_profile_id'.in => assister_profile_ids)
-                     search_hash = @staff.search_hash(@q)
-                     find_by_search_hash = @staff.where(search_hash)
-                     unsorted_search = find_by_agency_name + find_by_search_hash
-                     unsorted_search.sort_by(&:last_name).uniq
-                   end
+          @organizations = if @q.nil?
+                             page_letters = Array(page_no).map(&:to_s)
+                             # Avoid regex-based queries here (Brakeman DoS warning). Instead, match on the
+                             # first character of `legal_name` using an aggregation pipeline.
+                             allowed_letters = ('A'..'Z').to_a
+                             safe_letters = (page_letters.map(&:upcase) & allowed_letters).uniq
+
+                             if safe_letters.empty?
+                               []
+                             else
+                               selector = @organizations.selector
+                               ids = @organizations.collection.aggregate([
+                                 { '$match' => selector },
+                                 { '$addFields' => { '_first_char' => { '$toUpper' => { '$substrCP' => ['$legal_name', 0, 1] } } } },
+                                 { '$match' => { '_first_char' => { '$in' => safe_letters } } },
+                                 { '$project' => { '_id' => 1 } }
+                               ]).map { |doc| doc['_id'] }
+
+                               @organizations.where(:_id.in => ids).order_by(legal_name: 1).to_a
+                             end
+                           elsif @q.blank?
+                             @organizations.order_by(legal_name: 1).to_a
+                           else
+                             @organizations.where(legal_name: /#{Regexp.escape(@q)}/i)&.to_a
+                           end
         end
 
         # TODO: need to refactor for cases around SHOP assister agencies
@@ -161,7 +175,6 @@ def messages
           # don't use current_user
           # messages are different for current_user is admin and assister account login
           @assister_agency_profile = ::BenefitSponsors::Organizations::AssisterAgencyProfile.find(params[:id])
-          @assister_provider = @assister_agency_profile&.primary_assister_role&.person
           authorize @assister_agency_profile
 
           respond_to do |format|
@@ -171,20 +184,10 @@ def messages
 
         def inbox
           @sent_box = true
-          if params["id"].present?
-            provider_id = params["id"]
-            @assister_agency_provider = Person.find(provider_id)
-            @assister_agency_profile = @assister_agency_provider.assister_role.assister_agency_profile
-            authorize @assister_agency_profile
-          elsif params['profile_id'].present?
-            provider_id = params['profile_id']
-            @assister_agency_provider = find_assister_agency_profile(BSON::ObjectId(provider_id))
-            authorize @assister_agency_provider
-          end
+          @provider = ::BenefitSponsors::Organizations::AssisterAgencyProfile.find(params[:id])
+          authorize @provider
 
           @folder = (params[:folder] || 'Inbox').capitalize
-
-          @provider = (current_user.person._id.to_s == provider_id) ? current_user.person : @assister_agency_provider
         end
 
         # no auth required for this action: it is used to send an email for prospective assisters, which can be non-users
@@ -222,8 +225,12 @@ def user_not_authorized(exception)
         def send_general_agency_assign_msg(general_agency, employer_profile, status); end
 
         def eligible_assisters
-          assister_profile_ids = BenefitSponsors::Organizations::Organization.assister_agency_profiles.approved_assister_agencies.assister_agencies_by_market_kind(['both', person_market_kind]).map(&:assister_agency_profile).pluck(:id)
-          Person.where(:"assister_role.benefit_sponsors_assister_agency_profile_id".in => assister_profile_ids, :"assister_role.aasm_state" => "active")
+          profiles = BenefitSponsors::Organizations::Organization.assister_agency_profiles
+                                                                 .approved_assister_agencies
+                                                                 .assister_agencies_by_market_kind(['both', person_market_kind])
+                                                                 .map(&:assister_agency_profile)
+                                                                 .pluck(:primary_assister_role_id)
+          Person.where(:"assister_role._id".in => profiles, :"assister_role.aasm_state" => "active")
         end
 
         def update_ga_for_employers(assister_agency_profile, old_default_ga = nil); end
diff --git a/components/benefit_sponsors/app/controllers/benefit_sponsors/profiles/registrations_controller.rb b/components/benefit_sponsors/app/controllers/benefit_sponsors/profiles/registrations_controller.rb
index cff692c2832..a3d7d34fd61 100644
--- a/components/benefit_sponsors/app/controllers/benefit_sponsors/profiles/registrations_controller.rb
+++ b/components/benefit_sponsors/app/controllers/benefit_sponsors/profiles/registrations_controller.rb
@@ -20,6 +20,7 @@ def new
         @agency = BenefitSponsors::Organizations::OrganizationForms::RegistrationForm.for_new(profile_type: profile_type, portal: params[:portal])
         authorize @agency
         authorize @agency, :redirect_home?
+        authorize @agency, :can_create_assister_agency?
         respond_to do |format|
           format.html { render layout: 'bs4_application' if @bs4 }
           format.js
@@ -30,6 +31,7 @@ def new
       def create #rubocop:disable Metrics/CyclomaticComplexity
         @agency = BenefitSponsors::Organizations::OrganizationForms::RegistrationForm.for_create(registration_params)
         authorize @agency
+
         begin
           saved, result_url = verify_recaptcha_if_needed && @agency.save
           if saved && is_employer_profile?
@@ -83,7 +85,7 @@ def update
           flash[:notice] = 'Employer successfully Updated.' if is_employer_profile?
           flash[:notice] = 'Broker Agency Profile successfully Updated.' if is_broker_profile?
           flash[:notice] = 'General Agency Profile successfully Updated.' if is_general_agency_profile?
-          flash[:notice] = 'Assister Agency Profile successfully Updated.' if is_assister_profile?
+          flash[:notice] = 'Assister Organization Profile successfully Updated.' if is_assister_profile?
         else
           org_error_msg = @agency.errors.full_messages.join(",").humanize if @agency.errors.present?
 
diff --git a/components/benefit_sponsors/app/helpers/benefit_sponsors/application_helper.rb b/components/benefit_sponsors/app/helpers/benefit_sponsors/application_helper.rb
index 519570f223c..a5883d02d83 100644
--- a/components/benefit_sponsors/app/helpers/benefit_sponsors/application_helper.rb
+++ b/components/benefit_sponsors/app/helpers/benefit_sponsors/application_helper.rb
@@ -201,7 +201,7 @@ def total_assister_messages(record_id)
 
       if profile.primary_assister_role.present?
         person = profile.primary_assister_role.person
-        person.inbox.unread_messages.count
+        person.inbox.messages.where(message_read: false, folder: "inbox").count
       else
         0
       end
diff --git a/components/benefit_sponsors/app/models/benefit_sponsors/accounts/assister_agency_account.rb b/components/benefit_sponsors/app/models/benefit_sponsors/accounts/assister_agency_account.rb
index ae8159ab6dc..669ca734a57 100644
--- a/components/benefit_sponsors/app/models/benefit_sponsors/accounts/assister_agency_account.rb
+++ b/components/benefit_sponsors/app/models/benefit_sponsors/accounts/assister_agency_account.rb
@@ -72,6 +72,11 @@ def writing_agent
         return @writing_agent if defined? @writing_agent
         @writing_agent = AssisterRole.find(writing_agent_id)
       end
+
+      def coordinator
+        return @coordinator if defined? @coordinator
+        @coordinator = assister_agency_profile.primary_assister_role
+      end
     end
   end
 end
diff --git a/components/benefit_sponsors/app/models/benefit_sponsors/forms/assister_candidate.rb b/components/benefit_sponsors/app/models/benefit_sponsors/forms/assister_candidate.rb
index 15058a62dc6..c72a9aace0a 100644
--- a/components/benefit_sponsors/app/models/benefit_sponsors/forms/assister_candidate.rb
+++ b/components/benefit_sponsors/app/models/benefit_sponsors/forms/assister_candidate.rb
@@ -71,9 +71,9 @@ def match_or_create_person
 
       def validate_assister_agency
         if self.assister_agency_id.blank?
-          errors.add(:base, "Please select your assister agency.")
+          errors.add(:base, "Please select your assister organization.")
         elsif BenefitSponsors::Organizations::AssisterAgencyProfile.find(self.assister_agency_id).blank?
-          errors.add(:base, "Unable to locate the assister agnecy. Please contact HBX.")
+          errors.add(:base, "Unable to locate the assister organization. Please contact HBX.")
         end
       end
 
diff --git a/components/benefit_sponsors/app/models/benefit_sponsors/services/staff_role_service.rb b/components/benefit_sponsors/app/models/benefit_sponsors/services/staff_role_service.rb
index a5568feb891..95f3bb48381 100644
--- a/components/benefit_sponsors/app/models/benefit_sponsors/services/staff_role_service.rb
+++ b/components/benefit_sponsors/app/models/benefit_sponsors/services/staff_role_service.rb
@@ -137,9 +137,9 @@ def persist_assister_agency_staff_role!(profile)
           terminated_assisters_with_same_profile.assister_agency_pending!
           [true, person]
         elsif pending_assisters_with_same_profile.present?
-          [false,  "your application status was in pending with this Assister Agency"]
+          [false,  "your application status was in pending with this Assister Organization"]
         elsif active_assisters_with_same_profile.present?
-          [false,  "you are already associated with this Assister Agency"]
+          [false,  "you are already associated with this Assister Organization"]
         else
           person.assister_agency_staff_roles << ::AssisterAgencyStaffRole.new({assister_agency_profile: profile})
           person.save!
@@ -289,10 +289,10 @@ def deactivate_assister_agency_staff_role(person_id, assister_agency_profile_id)
           (role.benefit_sponsors_assister_agency_profile_id.to_s || role.assister_agency_profile_id.to_s) == assister_agency_profile_id.to_s && role.is_open?
         end
 
-        return false, 'No matching Assister Agency Staff role' if assister_agency_staff_role.blank?
+        return false, 'No matching Assister Organization Staff role' if assister_agency_staff_role.blank?
 
         assister_agency_staff_role.assister_agency_terminate!
-        [true, 'Assister Agency Staff Role is inactive']
+        [true, 'Assister Organization Staff Role is inactive']
       end
 
       def deactivate_general_agency_staff_role(person_id, general_agency_profile_id)
diff --git a/components/benefit_sponsors/app/policies/benefit_sponsors/organizations/organization_forms/registration_form_policy.rb b/components/benefit_sponsors/app/policies/benefit_sponsors/organizations/organization_forms/registration_form_policy.rb
index adc4646f3e6..a7fa228c033 100644
--- a/components/benefit_sponsors/app/policies/benefit_sponsors/organizations/organization_forms/registration_form_policy.rb
+++ b/components/benefit_sponsors/app/policies/benefit_sponsors/organizations/organization_forms/registration_form_policy.rb
@@ -114,6 +114,13 @@ def redirect_home?
 
           true
         end
+
+        def can_create_assister_agency?
+          return true unless is_assister_profile?
+          role = user&.person&.hbx_staff_role
+          return false unless role
+          role.permission&.can_create_assister_agency
+        end
       end
     end
   end
diff --git a/components/benefit_sponsors/app/views/benefit_sponsors/profiles/assister_agencies/assister_agency_profiles/_assister_help.html.erb b/components/benefit_sponsors/app/views/benefit_sponsors/profiles/assister_agencies/assister_agency_profiles/_assister_help.html.erb
index 5ec6ef855bd..a82a4e28b5c 100644
--- a/components/benefit_sponsors/app/views/benefit_sponsors/profiles/assister_agencies/assister_agency_profiles/_assister_help.html.erb
+++ b/components/benefit_sponsors/app/views/benefit_sponsors/profiles/assister_agencies/assister_agency_profiles/_assister_help.html.erb
@@ -17,8 +17,7 @@
         </div>
       </div>
     </div>
-    <h2><%= active_assister.person.full_name %></h2>
-    <h3><%= assister_agency_profile.legal_name %></h3>
+    <h2><%= assister_agency_profile.legal_name %></h2>
     <dl class="parent">
       <dt><%= l10n("phone")%>:</dt>
       <dd><%= active_assister.phone ? active_assister.phone.to_s : l10n("assister_agencies.profiles.no_phone_number") %></dd>
@@ -44,9 +43,11 @@
       <dt><%= l10n("language")%>:</dt>
       <dd><%= assister_agency_profile.languages %></dd>
     </dl>
-    <button type="button" class="outline close_assister_select"><%= l10n("previous_step")%></button>
-    <%= h(link_to "Go To My Expert", main_app.brokers_insured_families_path(tab: l10n("assisters_tab")), class: "button hidden go-to-expert mt-4") %>
-    <button type="button" <%= 'disabled' if !assister_agency_profile.accept_new_clients %> class="select-broker" data-assister='<%=@staff.id%>'><%= l10n("select_this_expert")%></button>
+    <div class="d-flex align-items-center">
+      <button type="button" class="outline close_assister_select mr-2"><%= l10n("previous_step")%></button>
+      <%= h(link_to l10n("go_to_my_expert"), main_app.brokers_insured_families_path(tab: l10n("assisters_tab")), class: "button hidden go-to-expert mt-4") %>
+      <button type="button" <%= 'disabled' if !assister_agency_profile.accept_new_clients %> class="btn btn-primary select-assister" data-cuke="select_this_assister" data-assister='<%= @assister.person.id %>'><%= l10n("select_this_expert")%></button>
+    </div>
   </section>
 <% else %>
   <div class="no-buffer" id="active_assister_tab">
diff --git a/components/benefit_sponsors/app/views/benefit_sponsors/profiles/assister_agencies/assister_agency_profiles/_staff.html.erb b/components/benefit_sponsors/app/views/benefit_sponsors/profiles/assister_agencies/assister_agency_profiles/_staff.html.erb
index ce70b8ec4df..64f4cbc7619 100644
--- a/components/benefit_sponsors/app/views/benefit_sponsors/profiles/assister_agencies/assister_agency_profiles/_staff.html.erb
+++ b/components/benefit_sponsors/app/views/benefit_sponsors/profiles/assister_agencies/assister_agency_profiles/_staff.html.erb
@@ -11,12 +11,11 @@
       <%= render 'benefit_sponsors/shared/profiles/assister_agency/alph_paginate_remote', url: benefit_sponsors.staff_index_profiles_assister_agencies_assister_agency_profiles_path(bs4: @bs4), alphs: @page_alphabets, alph_labels: @alph_labels %>
     </div>
   </div>
-   <div id='help_index_status'></div>
-   <div class="staff-container">
-    <% @staff.each do |staff|
-      @staff = staff
-      @assister = staff.assister_role %>
-      <%= render 'benefit_sponsors/profiles/assister_agencies/assister_agency_profiles/assister_help', locals: {:active_assister => @assister} %>
+  <div id='help_index_status'></div>
+  <div class="staff-container">
+    <% @organizations.each do |organization| %>
+      <% @assister = organization.assister_agency_profile.primary_assister_role %>
+      <%= render 'benefit_sponsors/profiles/assister_agencies/assister_agency_profiles/assister_help', locals: {active_assister: @assister} %>
     <% end %>
   </div>
 <% else %>
diff --git a/components/benefit_sponsors/app/views/benefit_sponsors/profiles/assister_agencies/assister_agency_profiles/_staff_table.html.erb b/components/benefit_sponsors/app/views/benefit_sponsors/profiles/assister_agencies/assister_agency_profiles/_staff_table.html.erb
index 7ebb8add970..a3f95bc27d4 100644
--- a/components/benefit_sponsors/app/views/benefit_sponsors/profiles/assister_agencies/assister_agency_profiles/_staff_table.html.erb
+++ b/components/benefit_sponsors/app/views/benefit_sponsors/profiles/assister_agencies/assister_agency_profiles/_staff_table.html.erb
@@ -1,22 +1,16 @@
 <% if @bs4 %>
 <thead>
     <tr class='border-top-0'>
-      <th class='col-sm-4'><%= l10n("expert_name")%></th>
       <th class='col-sm-3'><%= l10n("agency_name")%></th>
-      <th class='col-sm-3'><%= l10n("market_kind")%></th>
       <td class='col-sm-2'></td>
     </tr>
   </thead>
   <tbody>
-    <% @staff.each do |staff| %>
-      <% organization = BenefitSponsors::Organizations::Organization.where(:"profiles._id" => staff.assister_role.benefit_sponsors_assister_agency_profile_id).first %>
+    <% @organizations.each do |organization| %>
       <tr>
-        <td class='col-sm-4'><%= staff.first_name + ' ' + staff.last_name %></td>
-        <td class='col-sm-3'><%= organization.legal_name %></td>
-        <td class='col-sm-3'><% market_kind = organization.assister_agency_profile.market_kind.to_s %>
-          <%= (market_kind.eql? "both") ? l10n("shop_and_individual") : market_kind.titleize %><%= l10n("market")%></td>
-        <td class='col-sm-2'><a href='#' data-assister='<%=staff.assister_role.id%>' class='assister_select_button'><%= l10n("select")%></a></td>
-    </tr>
+        <td class='col-sm-10 py-2'><%= organization.legal_name %></td>
+        <td class='col-sm-2 py-2 text-right'><a href='#' data-assister='<%=organization.assister_agency_profile.primary_assister_role_id%>' class='assister_select_button'><%= l10n("select")%></a></td>
+      </tr>
     <% end %>
   </tbody>
 <% else %>
diff --git a/components/benefit_sponsors/app/views/benefit_sponsors/profiles/assister_agencies/assister_agency_profiles/messages.js.erb b/components/benefit_sponsors/app/views/benefit_sponsors/profiles/assister_agencies/assister_agency_profiles/messages.js.erb
index 1fd38593d9a..ab9dcc14979 100644
--- a/components/benefit_sponsors/app/views/benefit_sponsors/profiles/assister_agencies/assister_agency_profiles/messages.js.erb
+++ b/components/benefit_sponsors/app/views/benefit_sponsors/profiles/assister_agencies/assister_agency_profiles/messages.js.erb
@@ -1,4 +1,4 @@
-setTabContent("<%= escape_javascript render partial: 'benefit_sponsors/shared/inboxes/message_list', locals: { provider: @assister_provider } %>");
+setTabContent("<%= escape_javascript render partial: 'benefit_sponsors/shared/inboxes/message_list', locals: { provider: @assister_agency_provider } %>");
 set_active_ontab("#inbox-tab");
 var bs4 = document.documentElement.dataset.bs4 == "true";
 if (!bs4) {
diff --git a/components/benefit_sponsors/app/views/benefit_sponsors/profiles/assister_agencies/assister_agency_staff_roles/new.html.erb b/components/benefit_sponsors/app/views/benefit_sponsors/profiles/assister_agencies/assister_agency_staff_roles/new.html.erb
new file mode 100644
index 00000000000..69fa08d4cb3
--- /dev/null
+++ b/components/benefit_sponsors/app/views/benefit_sponsors/profiles/assister_agencies/assister_agency_staff_roles/new.html.erb
@@ -0,0 +1,87 @@
+<% if @bs4 %>
+  <%= render partial: 'new_staff_applicant' %>
+<% else %>
+
+<div class="assister-staff-registration-container mt-4 pt-4 pl-3 pr-3 pb-3">
+  <h1 class="heading-text" id="loaded"><%= l10n("assister_agency_staff") %></h1>
+</div>
+
+<div class="assister-staff-registration-container mt-4 pt-4 pl-3 pr-3 pb-3">
+  <h1 class="heading-text" id="loaded"><%= l10n("assister_agency_staff") %></h1>
+
+  <% flash.each do |key, value| %>
+    <div class="alert alert-<%= key %> alert-dismissible" role="alert">
+      <button class="close" type="button" data-dismiss="alert" aria-label="Close">
+        <span aria-hidden="true">&times;</span>
+      </button>
+      <% value.to_a.flatten.each do |v| %>
+        <%= raw v %>
+      <% end %>
+    </div>
+  <% end %>
+
+  <%= form_for(@staff, as: :staff, url: { action: "create" }, remote: true, html: { class: "needs-ajax-validation s508", id: "assister_staff_registration_form", novalidate: true }) do |f| %>
+    <div id="assister_staff"></div>
+    <%= render partial: "./ui-components/v1/forms/assister_registration/assister_agency_staff_information", locals: { f: f } %>
+  <% end %>
+
+  <%= form_for(@staff, as: :staff, url: { action: "create" }, remote: true, html: { class: "needs-ajax-validation s508", id: "assister_staff_registration_form", novalidate: true }) do |f| %>
+    <div id="assister_staff"></div>
+    <%= render partial: "./ui-components/v1/forms/assister_registration/assister_agency_staff_information", locals: { f: f } %>
+
+    <div class="row">
+      <div class="col-md-9 col-sm-9 col-xs-12 assister-agency-search"></div>
+
+      <div class="col-md-9 col-sm-9 col-xs-12 assister-agency-search">
+        <div class="row search-dropdown-wrapper">
+          <div class="col-md-12 col-sm-12 col-xs-12">
+            <h4>
+              <%= l10n("assister_agencies.assister_roles.select_your_assister_agency") %>
+              <%= l10n("assister_agencies.assister_roles.select_your_assister_agency") %>
+            </h4>
+
+            <div class="col-md-4 col-sm-6 col-xs-12 input-group input-no-pd">
+              <%= f.hidden_field :profile_id %>
+              <%= f.hidden_field :profile_type, value: "assister_agency_staff" %>
+              <%= f.hidden_field :is_assister_registration_page, value: true %>
+              <%= f.text_field :agency_search, placeholder: l10n("assister_agencies.assister_roles.agency_name_placeholder").to_s, class: "form-control" %>
+              <%= f.hidden_field :profile_type, value: "assister_agency_staff" %>
+              <%= f.hidden_field :is_assister_registration_page, value: true %>
+              <%= f.text_field :agency_search, placeholder: l10n("assister_agencies.assister_roles.agency_name_placeholder").to_s, class: "form-control" %>
+
+              <div class="input-group-btn">
+                <button class="btn btn-select search aa-search-btn" href="#" data-loading-text="Loading...">
+                  <i class="fa fa-search"></i>
+                  <%= l10n("search").to_s.downcase %>
+                </button>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div class="result"></div>
+      </div>
+
+      <br />
+    </div>
+
+    <div class="row">
+      <div class="col-md-9 col-sm-9 col-xs-12">
+        <div class="row no-buffer">
+          <div class="col-md-4 col-sm-4 col-xs-12 form-group-lg no-pd">
+            <br />
+            <button class="btn btn-primary" type="submit" disabled="disabled" id="assister-staff-btn"></button>
+            <button class="btn btn-primary" type="submit" disabled="disabled" id="assister-staff-btn">
+              <%= l10n("submit_application") %>
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  <% end %>
+
+  <%= javascript_tag do %>
+    validateAjaxForm();
+  <% end %>
+</div>
+<% end %>
diff --git a/components/benefit_sponsors/app/views/benefit_sponsors/profiles/assister_agencies/assister_agency_staff_roles/new.html.slim b/components/benefit_sponsors/app/views/benefit_sponsors/profiles/assister_agencies/assister_agency_staff_roles/new.html.slim
deleted file mode 100644
index 05690e1ccc8..00000000000
--- a/components/benefit_sponsors/app/views/benefit_sponsors/profiles/assister_agencies/assister_agency_staff_roles/new.html.slim
+++ /dev/null
@@ -1,51 +0,0 @@
-.assister-staff-registration-container.mt-4.pt-4.pl-3.pr-3.pb-3
-  h1.heading-text#loaded = l10n("assister_agency_staff")
-.assister-staff-registration-container.mt-4.pt-4.pl-3.pr-3.pb-3
-  h1.heading-text#loaded = l10n("assister_agency_staff")
-  - flash.each do |key, value|
-    div class="alert alert-#{key} alert-dismissible" role="alert"
-      button.close type="button" data-dismiss="alert" aria-label="Close"
-        span aria-hidden="true" &times
-      - value.to_a.flatten.each do |v|
-        = raw v
-  = form_for @staff, as: :staff, url: {action: "create"}, remote: true,  html: {class: "needs-ajax-validation s508", id: 'assister_staff_registration_form', novalidate:true} do |f|
-    div#assister_staff
-    = render partial: './ui-components/v1/forms/assister_registration/assister_agency_staff_information', locals: {f: f}
-  = form_for @staff, as: :staff, url: {action: "create"}, remote: true,  html: {class: "needs-ajax-validation s508", id: 'assister_staff_registration_form', novalidate:true} do |f|
-    div#assister_staff
-    = render partial: './ui-components/v1/forms/assister_registration/assister_agency_staff_information', locals: {f: f}
-    .row
-      .col-md-9.col-sm-9.col-xs-12.assister-agency-search
-      .col-md-9.col-sm-9.col-xs-12.assister-agency-search
-        .row.search-dropdown-wrapper
-          .col-md-12.col-sm-12.col-xs-12
-            h4
-              = l10n("assister_agencies.assister_roles.select_your_assister_agency")
-              = l10n("assister_agencies.assister_roles.select_your_assister_agency")
-            .col-md-4.col-sm-6.col-xs-12.input-group.input-no-pd
-              = f.hidden_field :profile_id
-              = f.hidden_field :profile_type, value: "assister_agency_staff"
-              = f.hidden_field :is_assister_registration_page, value: true
-              = f.text_field :agency_search, placeholder: "#{l10n('assister_agencies.assister_roles.agency_name_placeholder')}", class: 'form-control'
-              = f.hidden_field :profile_type, value: "assister_agency_staff"
-              = f.hidden_field :is_assister_registration_page, value: true
-              = f.text_field :agency_search, placeholder: "#{l10n('assister_agencies.assister_roles.agency_name_placeholder')}", class: 'form-control'
-              .input-group-btn
-                button.btn.btn-select.search.aa-search-btn[href="#" data-loading-text="Loading..."]
-                  i.fa.fa-search
-                  = l10n("search").to_s.downcase
-        .result
-
-
-      br
-    .row
-      .col-md-9.col-sm-9.col-xs-12
-        .row.no-buffer
-          .col-md-4.col-sm-4.col-xs-12.form-group-lg.no-pd
-            br
-            button.btn.btn-primary[type="submit" disabled='disabled' id= 'assister-staff-btn']
-            button.btn.btn-primary[type="submit" disabled='disabled' id= 'assister-staff-btn']
-              = l10n("submit_application")
-
-javascript:
-  validateAjaxForm();
diff --git a/components/benefit_sponsors/app/views/benefit_sponsors/profiles/registrations/_assister_registration_form.html.erb b/components/benefit_sponsors/app/views/benefit_sponsors/profiles/registrations/_assister_registration_form.html.erb
index 053ecdc5ca1..b093ce73538 100644
--- a/components/benefit_sponsors/app/views/benefit_sponsors/profiles/registrations/_assister_registration_form.html.erb
+++ b/components/benefit_sponsors/app/views/benefit_sponsors/profiles/registrations/_assister_registration_form.html.erb
@@ -16,9 +16,6 @@
           <%= render partial: "benefit_sponsors/shared/profiles/broker_agency/bank_information", locals: {f: f} %>
         <% end %>
         <%= render partial: './ui-components/bs4/v1/forms/broker/contact_information/contact_info_fields', locals: { f: f, registration: true } %>
-        <% if EnrollRegistry.feature_enabled?(:broker_attestation_fields) %>
-          <%= render partial: './ui-components/bs4/v1/forms/assister/attestation_agreement_fields' %>
-        <% end %>
         <% if (aca_broker_routing_information && @agency.profile_type == "broker_agency") %>
           <h5 class="heading-text">
             <%= l10n("broker_agencies.broker_roles.broker_registration_text", site_short_name: site_short_name, site_brokers_agreement_path: site_brokers_agreement_path) %>
@@ -29,7 +26,7 @@
     <% if registration_recaptcha_enabled?(@profile_type) %>
       <%= recaptcha_tags %>
     <% end %>
-    <%= f.submit l10n('assister_agencies.new_assister_agency_form.create_assister_agency'), class: 'btn btn-primary', id: 'assister-btn', disabled: EnrollRegistry.feature_enabled?(:broker_attestation_fields) %>
+    <%= f.submit l10n('assister_agencies.new_assister_agency_form.create_assister_agency'), class: 'btn btn-primary', id: 'assister-btn' %>
   <% end %>
 </div>
 <script>
diff --git a/components/benefit_sponsors/spec/controllers/benefit_sponsors/profiles/registrations_controller_spec.rb b/components/benefit_sponsors/spec/controllers/benefit_sponsors/profiles/registrations_controller_spec.rb
index e870e5e557c..c52e63bc97d 100644
--- a/components/benefit_sponsors/spec/controllers/benefit_sponsors/profiles/registrations_controller_spec.rb
+++ b/components/benefit_sponsors/spec/controllers/benefit_sponsors/profiles/registrations_controller_spec.rb
@@ -215,7 +215,6 @@ module BenefitSponsors # rubocop:disable Metrics/ModuleLength
 
       it_behaves_like "initialize profile for new", "benefit_sponsor"
       it_behaves_like "initialize profile for new", "broker_agency"
-      it_behaves_like "initialize profile for new", "assister_agency"
       it_behaves_like "initialize profile for new", "general_agency"
       # it_behaves_like "initialize profile for new", "issuer"
       # it_behaves_like "initialize profile for new", "contact_center"
@@ -928,5 +927,28 @@ def sanitize_attributes(profile_type)
         end
       end
     end
+
+    describe "GET new for assister_agency" do
+      let!(:hbx_person) { FactoryBot.create(:person) }
+      let!(:hbx_user) { FactoryBot.create(:user, person: hbx_person) }
+
+      before do
+        allow(EnrollRegistry).to receive(:feature_enabled?).with(:assister_agency).and_return(true)
+      end
+
+      context "when user does not have permission to create assister agency" do
+        before do
+          sign_in hbx_user
+          permission = instance_double("Permission", can_create_assister_agency: false)
+          role = instance_double("HbxStaffRole", permission: permission)
+          allow(hbx_person).to receive(:hbx_staff_role).and_return(role)
+          get :new, params: {profile_type: "assister_agency"}
+        end
+
+        it "should redirect to root path" do
+          expect(response).to have_http_status(:redirect)
+        end
+      end
+    end
   end
 end
diff --git a/components/benefit_sponsors/spec/dummy/spec/factories/users.rb b/components/benefit_sponsors/spec/dummy/spec/factories/users.rb
index 57973c5eaed..643d2054af7 100644
--- a/components/benefit_sponsors/spec/dummy/spec/factories/users.rb
+++ b/components/benefit_sponsors/spec/dummy/spec/factories/users.rb
@@ -31,4 +31,15 @@
       FactoryBot.create :person, :with_consumer_role, :with_family, :with_active_consumer_role, :user => user
     end
   end
+
+  trait :hbx_staff do
+    roles { ["hbx_staff"] }
+
+    after :create do |user, evaluator|
+      if user.person.present?
+      user.person.hbx_staff_role = FactoryBot.build :hbx_staff_role
+      user.save
+      end
+    end
+  end
 end
diff --git a/components/benefit_sponsors/spec/models/benefit_sponsors/forms/assister_candidate_spec.rb b/components/benefit_sponsors/spec/models/benefit_sponsors/forms/assister_candidate_spec.rb
index 343370592af..43182bd4168 100644
--- a/components/benefit_sponsors/spec/models/benefit_sponsors/forms/assister_candidate_spec.rb
+++ b/components/benefit_sponsors/spec/models/benefit_sponsors/forms/assister_candidate_spec.rb
@@ -98,7 +98,7 @@
       end
     end
 
-    context 'when Applicant is a assister agency staff member and assister_org_id is missing' do
+    context 'when Applicant is a assister organization staff member and assister_org_id is missing' do
       let(:attributes) { { assister_applicant_type: 'staff' } }
 
       it "should skip assister_org_id validation" do
@@ -122,13 +122,13 @@
     end
   end
 
-  describe "Assister Agency validations" do
+  describe "Assister Organization validations" do
 
     before :each do
       subject.valid?
     end
 
-    context 'when assister agency missing' do
+    context 'when assister organization missing' do
       let(:other_attributes) do
         {
           assister_agency_id: nil
@@ -136,11 +136,11 @@
       end
 
       it "should raise an error" do
-        expect(subject.errors.to_hash[:base]).to include("Please select your assister agency.")
+        expect(subject.errors.to_hash[:base]).to include("Please select your assister organization.")
       end
     end
 
-    context 'when assister agency not found in database' do
+    context 'when assister organization not found in database' do
       let(:other_attributes) do
         {
           assister_agency_id: "55929d867261670838550000"
@@ -148,7 +148,7 @@
       end
 
       it "should raise an error" do
-        expect(subject.errors.to_hash[:base]).to include("Unable to locate the assister agnecy. Please contact HBX.")
+        expect(subject.errors.to_hash[:base]).to include("Unable to locate the assister organization. Please contact HBX.")
       end
     end
   end
@@ -299,4 +299,4 @@
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/components/benefit_sponsors/spec/models/benefit_sponsors/services/staff_role_service_spec.rb b/components/benefit_sponsors/spec/models/benefit_sponsors/services/staff_role_service_spec.rb
index 38d66514b57..6c403c52201 100644
--- a/components/benefit_sponsors/spec/models/benefit_sponsors/services/staff_role_service_spec.rb
+++ b/components/benefit_sponsors/spec/models/benefit_sponsors/services/staff_role_service_spec.rb
@@ -170,7 +170,7 @@ module BenefitSponsors
 
 
         it 'should not add assister staff role' do
-          expect(subject.add_profile_representative!(staff_role_form)).to eq [false, "you are already associated with this Assister Agency"]
+          expect(subject.add_profile_representative!(staff_role_form)).to eq [false, "you are already associated with this Assister Organization"]
         end
       end
 
diff --git a/db/seedfiles/translations/en/dc/assister_agencies.rb b/db/seedfiles/translations/en/dc/assister_agencies.rb
index bb6f177adf4..d7363030081 100644
--- a/db/seedfiles/translations/en/dc/assister_agencies.rb
+++ b/db/seedfiles/translations/en/dc/assister_agencies.rb
@@ -1,9 +1,9 @@
 ASSISTER_AGENCIES_TRANSLATIONS = {
-  "en.assister_agencies.assister_roles.new_assister_agency_form.assister_agency_information" => "Assister Agency Information",
+  "en.assister_agencies.assister_roles.new_assister_agency_form.assister_agency_information" => "Assister Organization Information",
   "en.assister_org_id" => "Assister Organization ID",
-  "en.assister_agencies.assister_roles.agency_name_placeholder" => "Agency Name or Assister Org ID",
+  "en.assister_agencies.assister_roles.agency_name_placeholder" => "Organization Name or Assister Org ID",
   "en.assister_agencies.search" => "Search",
-  "en.assister_agencies.new_assister_agency_form.create_assister_agency" => "Create Assister Agency",
+  "en.assister_agencies.new_assister_agency_form.create_assister_agency" => "Create Assister Organization",
   "en.assister_agencies.confirmation.heading" => "We Received Your Assister Application",
   "en.assister_agencies.confirmation.description1" => "Now that you’ve registered, we will review your application and confirm that you have:",
   "en.assister_agencies.confirmation.li1" => "Completed the",
@@ -16,11 +16,11 @@
   "en.assister_agencies.assister_roles.confirmation.description4" => "If you have any questions call CoverME.gov at (866) 636-0355 TTY: 711",
   "en.select_this_assister_button" => "Select This Assister",
   "en.assister_role.assister_org_id" => "Assister Organization ID",
-  "en.assister_agencies.agency_details" => "Agency Details",
-  "en.assister_agencies.edit_profile" => "Edit Agency Profile",
+  "en.assister_agencies.agency_details" => "Organization Details",
+  "en.assister_agencies.edit_profile" => "Edit Organization Profile",
   "en.assister_agencies.profiles.assister_agency_contacts" => "Contacts",
   "en.aassister_agencies.profiles.primary_aassister_role_info" => "Primary Assister Role Info (Assister Org Id / provider kind / active)",
-  "en.assister_agencies.profiles.no_assister_agency_contacts_found" => "No Assister Agency Contacts found.",
+  "en.assister_agencies.profiles.no_assister_agency_contacts_found" => "No Assister Organization Contacts found.",
   "en.assister_agencies.staff" => "Staff",
   "en.assister_agency_staff" => "Assister Staff",
   "en.assister_agency_staff_registration" => "Assister Staff Registration",
@@ -42,13 +42,13 @@
   "en.assister_org_id" => "Assister Organization ID",
   "en.assister_attestation.required_trainings" => "We have completed all required <a href=%{trainings_link} target='_blank' rel='noopener noreferrer'> %{site_short_name} trainings</a>",
   "en.assister_attestation.assister_agreement" => "I have read and agree to the <a href=%{agreement_pdf_url} target='_blank' rel='noopener noreferrer'>%{site_short_name} Assister Agreement</a>",
-  "en.insured.plan_shoppings.assister1" => "to use the map feature by entering your town name or zip code. Once you find your expert, return here to add them to your account by choosing 'Select a Broker' or 'Select an Assister'. On the next page, search for assisters by their agency name and search for brokers by their first and last name.",
+  "en.insured.plan_shoppings.assister1" => "to use the map feature by entering your town name or zip code. Once you find your expert, return here to add them to your account by choosing 'Select a Broker' or 'Select an Assister'. On the next page, search for assisters by their organization name and search for brokers by their first and last name.",
   "en.insured.plan_shoppings.assister2" => "If you already know the broker or assister you want to choose, 'Select a Broker' or 'Select an Assister'.",
   "en.insured.plan_shoppings.what_a_broker" => "What is a Broker?",
   "en.insured.plan_shoppings.broker_description" => "Brokers are licensed professionals with health insurance expertise who can help you find a plan that fits your needs. In Oregon, Brokers must have an active Oregon insurance license in good standing, and complete training on CoverME.gov. A broker will be able to help you at no cost to you, but they may get paid by an insurance company.",
   "en.insured.plan_shoppings.what_aa_assister" => "What is an Assister?",
   "en.insured.assisters.remove_assister" => "Remove Assister",
-  "en.insured.assisters.agency" => "Assister Agency",
+  "en.insured.assisters.agency" => "Assister Organization",
   "en.insured.assisters.assignment_date" => "Assignment Date",
   "en.insured.assisters.removal_warning" => "Are you sure you want to remove this expert?",
   "en.insured.assisters.removal_confirm" => "Yes, Remove Expert",
@@ -56,12 +56,12 @@
   "en.broker_agencies.broker" => "Select a Broker",
   "en.assister_agencies.assister" => "Select an Assister",
   "en.layout.header.role.assister" => "Assister",
-  "en.assister_agencies.profiles.assister_agencies" => "Assister Agencies",
+  "en.assister_agencies.profiles.assister_agencies" => "Assister Organizations",
   "en.assister_agencies.profiles.warning_for_existing_assister" => "Warning: if you already have an existing assister, they will be terminated effective immediately.",
   "en.assister_agencies.profiles.no_phone_number" => "No Phone Number",
   "en.assister_agencies.profiles.new_clients" => "New Clients",
   "en.assister_agencies.profiles.weekend_evening_hours" => "Weekend/Evening Hours",
-  "en.welcome.index.assister_agency_portal" => "Assister Agency Portal",
+  "en.welcome.index.assister_agency_portal" => "Assister Organization Portal",
   "en.my_assister" => "My Assister",
   "en.my_expert" => "My Expert",
   "en.all" => "All",
@@ -71,7 +71,7 @@
   "en.broker" => "Broker",
   "en.consumer" => "Consumer",
   "en.help_from_expert_title" => "Get Help from an Expert",
-  "en.welcome.index.assister_agency_registration" => "Assister Agency Registration",
+  "en.welcome.index.assister_agency_registration" => "Assister Organization Registration",
   "en.assister_agencies.first_name" => "First Name",
 	"en.assister_agencies.last_name" => "Last Name",
 	"en.assister_agencies.dob" => "Date of Birth",
diff --git a/db/seedfiles/translations/en/me/assister_agencies.rb b/db/seedfiles/translations/en/me/assister_agencies.rb
index c32ada566c3..ed47ffece97 100644
--- a/db/seedfiles/translations/en/me/assister_agencies.rb
+++ b/db/seedfiles/translations/en/me/assister_agencies.rb
@@ -1,9 +1,9 @@
 ASSISTER_AGENCIES_TRANSLATIONS = {
-  "en.assister_agencies.assister_roles.new_assister_agency_form.assister_agency_information" => "Assister Agency Information",
+  "en.assister_agencies.assister_roles.new_assister_agency_form.assister_agency_information" => "Assister Organization Information",
   "en.assister_org_id" => "Assister Organization ID",
-  "en.assister_agencies.assister_roles.agency_name_placeholder" => "Agency Name or Assister Org ID",
+  "en.assister_agencies.assister_roles.agency_name_placeholder" => "Organization Name or Assister Org ID",
   "en.assister_agencies.search" => "Search",
-  "en.assister_agencies.new_assister_agency_form.create_assister_agency" => "Create Assister Agency",
+  "en.assister_agencies.new_assister_agency_form.create_assister_agency" => "Create Assister Organization",
   "en.assister_agencies.confirmation.heading" => "We Received Your Assister Application",
   "en.assister_agencies.confirmation.description1" => "Now that you’ve registered, we will review your application and confirm that you have:",
   "en.assister_agencies.confirmation.li1" => "Completed the",
@@ -16,11 +16,11 @@
   "en.assister_agencies.assister_roles.confirmation.description4" => "If you have any questions call CoverME.gov at (866) 636-0355 TTY: 711",
   "en.select_this_assister_button" => "Select This Assister",
   "en.assister_role.assister_org_id" => "Assister Organization ID",
-  "en.assister_agencies.agency_details" => "Agency Details",
-  "en.assister_agencies.edit_profile" => "Edit Agency Profile",
+  "en.assister_agencies.agency_details" => "Organization Details",
+  "en.assister_agencies.edit_profile" => "Edit Organization Profile",
   "en.assister_agencies.profiles.assister_agency_contacts" => "Contacts",
   "en.aassister_agencies.profiles.primary_aassister_role_info" => "Primary Assister Role Info (Assister Org Id / provider kind / active)",
-  "en.assister_agencies.profiles.no_assister_agency_contacts_found" => "No Assister Agency Contacts found.",
+  "en.assister_agencies.profiles.no_assister_agency_contacts_found" => "No Assister Organization Contacts found.",
   "en.assister_agencies.staff" => "Staff",
   "en.assister_agency_staff" => "Assister Staff",
   "en.assister_agency_staff_registration" => "Assister Staff Registration",
@@ -42,26 +42,27 @@
   "en.assister_org_id" => "Assister Organization ID",
   "en.assister_attestation.required_trainings" => "We have completed all required <a href=%{trainings_link} target='_blank' rel='noopener noreferrer'> %{site_short_name} trainings</a>",
   "en.assister_attestation.assister_agreement" => "I have read and agree to the <a href=%{agreement_pdf_url} target='_blank' rel='noopener noreferrer'>%{site_short_name} Assister Agreement</a>",
-  "en.insured.plan_shoppings.assister1" => "to use the map feature by entering your town name or zip code. Once you find your expert, return here to add them to your account by choosing 'Select a Broker' or 'Select an Assister'. On the next page, search for assisters by their agency name and search for brokers by their first and last name.",
+  "en.insured.plan_shoppings.assister1" => "to use the map feature by entering your town name or zip code. Once you find your expert, return here to add them to your account by choosing 'Select a Broker' or 'Select an Assister'. On the next page, search for assisters by their organization name and search for brokers by their first and last name.",
   "en.insured.plan_shoppings.assister2" => "If you already know the broker or assister you want to choose, 'Select a Broker' or 'Select an Assister'.",
   "en.insured.plan_shoppings.what_a_broker" => "What is a Broker?",
   "en.insured.plan_shoppings.broker_description" => "Brokers are licensed professionals with health insurance expertise who can help you find a plan that fits your needs. In Oregon, Brokers must have an active Oregon insurance license in good standing, and complete training on CoverME.gov. A broker will be able to help you at no cost to you, but they may get paid by an insurance company.",
   "en.insured.plan_shoppings.what_aa_assister" => "What is an Assister?",
   "en.insured.assisters.remove_assister" => "Remove Assister",
-  "en.insured.assisters.agency" => "Assister Agency",
+  "en.insured.assisters.agency" => "Assister Organization",
   "en.insured.assisters.assignment_date" => "Assignment Date",
   "en.insured.assisters.removal_warning" => "Are you sure you want to remove this expert?",
   "en.insured.assisters.removal_confirm" => "Yes, Remove Expert",
+  "en.remove_expert" => "Remove Expert",
   "en.insured.your_assister" => "Your Assister",
   "en.broker_agencies.broker" => "Select a Broker",
   "en.assister_agencies.assister" => "Select an Assister",
   "en.layout.header.role.assister" => "Assister",
-  "en.assister_agencies.profiles.assister_agencies" => "Assister Agencies",
+  "en.assister_agencies.profiles.assister_agencies" => "Assister Organizations",
   "en.assister_agencies.profiles.warning_for_existing_assister" => "Warning: if you already have an existing assister, they will be terminated effective immediately.",
   "en.assister_agencies.profiles.no_phone_number" => "No Phone Number",
   "en.assister_agencies.profiles.new_clients" => "New Clients",
   "en.assister_agencies.profiles.weekend_evening_hours" => "Weekend/Evening Hours",
-  "en.welcome.index.assister_agency_portal" => "Assister Agency Portal",
+  "en.welcome.index.assister_agency_portal" => "Assister Organization Portal",
   "en.my_assister" => "My Assister",
   "en.my_expert" => "My Expert",
   "en.all" => "All",
@@ -71,7 +72,8 @@
   "en.broker" => "Broker",
   "en.consumer" => "Consumer",
   "en.help_from_expert_title" => "Get Help from an Expert",
-  "en.welcome.index.assister_agency_registration" => "Assister Agency Registration",
+  "en.go_to_my_expert" => "Go To My Expert",
+  "en.welcome.index.assister_agency_registration" => "Assister Organization Registration",
   "en.assister_agencies.first_name" => "First Name",
 	"en.assister_agencies.last_name" => "Last Name",
 	"en.assister_agencies.dob" => "Date of Birth",
diff --git a/db/seedfiles/translations/en/me/shared.rb b/db/seedfiles/translations/en/me/shared.rb
index 35ed54ad01d..49704643d63 100644
--- a/db/seedfiles/translations/en/me/shared.rb
+++ b/db/seedfiles/translations/en/me/shared.rb
@@ -6,6 +6,7 @@
     "en.new_address_shared" => "NEW ADDRESS",
     "en.home_address_shared" => "Home Address",
     "en.not_sure" => "Not sure?",
+    "en.not_authorized" => "You are not authorized to take this action.",
     "en.support_texts.new_address_shared" => "NEW ADDRESS",
     "en.support_texts.home_address_shared" => "Home Address",
     "en.support_texts.sex_gender" => "Sex is a required field on the application. You can choose how to answer this question, and we don’t compare your response against any data sources. The sex you choose is included in the information we send to your insurance company, but it’s a violation of Maine law to restrict access to health benefits based on sex or identity.",
diff --git a/db/seedfiles/translations/en/me/user_roles.rb b/db/seedfiles/translations/en/me/user_roles.rb
index 48ebcb892f9..aa4aa69f44a 100644
--- a/db/seedfiles/translations/en/me/user_roles.rb
+++ b/db/seedfiles/translations/en/me/user_roles.rb
@@ -9,7 +9,7 @@
 #   l10n('user_roles.assister') # => 'Assister'
 USER_ROLES_TRANSLATIONS = {
   'en.user_roles.assister' => 'Assister',
-  'en.user_roles.assister_agency_staff' => 'Assister Agency Staff',
+  'en.user_roles.assister_agency_staff' => 'Assister Organization Staff',
   'en.user_roles.broker' => 'Broker',
   'en.user_roles.broker_agency_staff' => 'Broker Agency Staff',
   'en.user_roles.consumer' => 'Consumer',
diff --git a/features/assisters/asister_applicant_edit.feature b/features/assisters/asister_applicant_edit.feature
index a8178ad7155..4f8b039c3a6 100644
--- a/features/assisters/asister_applicant_edit.feature
+++ b/features/assisters/asister_applicant_edit.feature
@@ -11,5 +11,6 @@ Feature: HBX Admin Edits a Assister Applicant
     # Skipped the steps here due to constant intermittent failures with clicking links
     And HBX Admin visits the Edit Assister Applicant page for Max Planck of agency District Assisters Inc
     And HBX Admin edits the assister application and clicks update
+    And HBX Admin does not see a training checkbox
     Then the HBX Admin should see a success message that the assister application was successfully updated
 
diff --git a/features/assisters/assister_registration.feature b/features/assisters/assister_registration.feature
new file mode 100644
index 00000000000..51f4ba4be8d
--- /dev/null
+++ b/features/assisters/assister_registration.feature
@@ -0,0 +1,11 @@
+Feature: Assister Organization Registration
+  Background: Assister Agency is enabled
+    Given bs4_admin_flow feature is enabled
+    Given bs4_broker_flow feature is enabled
+    And EnrollRegistry assister_agency feature is enabled
+
+  Scenario: Admin Assister Org Registration
+    Given Hbx Admin exists
+    When Hbx Admin logs on to the Hbx Portal
+    And the user is on the Family Index of the Admin Dashboard
+    Then Hbx Admin clicks link to register new Assister
diff --git a/features/hbx_admin/get_help_in_signup.feature b/features/hbx_admin/get_help_in_signup.feature
index fb672ae6b5a..c820b235344 100644
--- a/features/hbx_admin/get_help_in_signup.feature
+++ b/features/hbx_admin/get_help_in_signup.feature
@@ -17,7 +17,8 @@ Feature: Get Help in Signing Up from Assister/Broker
     And clicks on #help_me_sign_up
     And clicks on #bottom_expert_assister_link
     Then assister record exists and should be able to click on the Select button
-    And should be able to click on the Select This broker button
+    Then the heading displays the agency name
+    And should be able to click on the Select This assister button
     Then should be able to see the success message
 
   Scenario: Admin can view brokers and can select them
diff --git a/features/insured/individual_expert.feature b/features/insured/individual_expert.feature
index a5c180c384b..de46a13ba8a 100644
--- a/features/insured/individual_expert.feature
+++ b/features/insured/individual_expert.feature
@@ -12,12 +12,25 @@ Feature: Consumer My Expert page
   Scenario: Consumer sees correct consumer navigation pane
     Then the consumer should see Expert page navigation link
 
+  Scenario: Consumer has assister and broker
+    And EnrollRegistry assister_agency feature is enabled
+    And an individual market assister exists
+    And the existing family has an assister agency account
+    When the consumer goes to the Expert page
+    Then the consumer should see the broker information
+    Then the consumer should see the assister information
+    Then the consumer should see the assister subtitle
+    Then the consumer should not see the Help with Plan Shopping modal
+    And the consumer clicks on the Remove Broker button
+    When the consumer goes to the Expert page
+    Then the consumer should not see the broker information
+    Then the consumer should see the assister information
+    Then the consumer should not see the assister subtitle
+    Then the consumer should see the Help with Plan Shopping modal
+
   Scenario: Consumer sees Help with Plan Shopping modal
     And EnrollRegistry assister_agency feature is enabled
     When the consumer goes to the Expert page
     When the consumer selects Select an Assister button
     Then the consumer should see the Help with Plan Shopping modal
-    
-  # TODO: add scenario for modal button:
-  # -> should be hidden when consumer has both an assister expert and broker expert
-  # -> should be present otherwise with correct text based on which expert type the consumer has
+
diff --git a/features/step_definitions/assister_applicant_edit_steps.rb b/features/step_definitions/assister_applicant_edit_steps.rb
index d2604a2186a..f0e49569644 100644
--- a/features/step_definitions/assister_applicant_edit_steps.rb
+++ b/features/step_definitions/assister_applicant_edit_steps.rb
@@ -7,6 +7,10 @@
   visit(url)
 end
 
+And(/^.+ does not see a training checkbox$/) do
+  expect(page).not_to have_css("input[name='person[assister_role_attributes][training]']")
+end
+
 And(/^.+ edits the assister application and clicks update$/) do
   # This page was unable to update in the past
   click_button('Update')
diff --git a/features/step_definitions/assisters_steps.rb b/features/step_definitions/assisters_steps.rb
index a25a6c3136b..282700bbeb6 100644
--- a/features/step_definitions/assisters_steps.rb
+++ b/features/step_definitions/assisters_steps.rb
@@ -18,6 +18,12 @@ module AssisterStepsHelper
   expect(page).to have_content("Assister Agency Information")
 end
 
+Then(/^.+ clicks link to register new Assister$/) do
+
+  find('.interaction-click-control-assisters').click(wait: 1)
+  find('#assister-agencies-registration').click
+end
+
 And(/^.+ enters assister agency information for individual markets$/) do
   fill_in 'organization[legal_name]', with: "Logistics Inc"
   fill_in 'organization[dba]', with: "Logistics Inc"
diff --git a/features/step_definitions/help_me_sign_up_steps.rb b/features/step_definitions/help_me_sign_up_steps.rb
index 99c3bde9baa..015f24739b4 100644
--- a/features/step_definitions/help_me_sign_up_steps.rb
+++ b/features/step_definitions/help_me_sign_up_steps.rb
@@ -50,10 +50,17 @@
 Then("assister record exists and should be able to click on the Select button") do
   within("#assister_index_view") do
     expect(page).to have_css("tbody tr", count: 1)
+    expect(page).not_to have_content(l10n("expert_name"))
+    expect(page).not_to have_content(l10n("market_kind"))
+    expect(page).to have_content(l10n("agency_name"))
     find(".assister_select_button").click
   end
 end
 
+Then("the heading displays the agency name") do
+  expect(find('h2').text).to eq("ACME Widgets, Inc.")
+end
+
 Then("broker record exists and should be able to click on the Select button") do
   within("#broker_index_view") do
     expect(page).to have_css("tbody tr", count: 1)
@@ -65,6 +72,10 @@
   find("button.select-broker").click
 end
 
+And("should be able to click on the Select This assister button") do
+  find("button[data-cuke='select_this_assister']").click
+end
+
 Then("should be able to see the success message") do
   expect(page).to have_css(".alert-success")
 end
diff --git a/features/step_definitions/individual_expert_steps.rb b/features/step_definitions/individual_expert_steps.rb
index a4a0853d179..f0bfa13d3e3 100644
--- a/features/step_definitions/individual_expert_steps.rb
+++ b/features/step_definitions/individual_expert_steps.rb
@@ -11,10 +11,43 @@
   find(IvlExpertPage.expert_navigation_link).click
 end
 
+Then(/the consumer should see the assister information/) do
+  expect(page).to have_css("[data-cuke='assister-details']")
+end
+
+Then(/the consumer should see the broker information/) do
+  expect(page).to have_css("[data-cuke='broker-details']")
+end
+
+Then(/the consumer should not see the broker information/) do
+  expect(page).not_to have_css("[data-cuke='broker-details']")
+end
+
+Then(/the consumer should not see the assister information/) do
+  expect(page).not_to have_css("[data-cuke='assister-details']")
+end
+
+Then(/the consumer should see the assister subtitle/) do
+  expect(page).to have_css("[data-cuke='assister-subtitle']", text: "Assister")
+end
+
+Then(/the consumer should not see the assister subtitle/) do
+  expect(page).not_to have_css("[data-cuke='assister-subtitle']")
+end
+
 When(/the consumer selects Select an Assister button/) do
   find(IvlExpertPage.select_an_assister_btn).click
 end
 
 Then(/the consumer should see the Help with Plan Shopping modal/) do
-  expect(page).to have_selector("h3", text: /Find An Assister/)
+  expect(page).to have_selector("[data-cuke='select-expert-button']")
+end
+
+Then(/the consumer should not see the Help with Plan Shopping modal/) do
+  expect(page).not_to have_selector("[data-cuke='select-expert-button']")
+end
+
+And(/the consumer clicks on the Remove Broker button/) do
+  find('[data-target="#destroyBroker"]').click(wait: 1)
+  find('[data-cuke="confirm-remove-broker"]').click
 end
diff --git a/features/support/worlds/assister_agency_world.rb b/features/support/worlds/assister_agency_world.rb
index f6fbd1fa703..cd0d1c4b926 100644
--- a/features/support/worlds/assister_agency_world.rb
+++ b/features/support/worlds/assister_agency_world.rb
@@ -104,7 +104,11 @@ def assister_agency_profile_with_organization(*traits)
 
 Given(/^an individual market assister exists$/) do
   @assister_agency_profile = assister_agency_profile_with_organization market_kind: :individual
-  assister :with_family, :assister_with_person, organization: @assister_agency_profile.organization
+  @assister_person = FactoryBot.create(:person, :with_work_email, :with_work_phone)
+  @assister_person.save!
+  FactoryBot.create(:user, person: @assister_person)
+  @assister_agency_profile.primary_assister_role = FactoryBot.create :assister_role, person: @assister_person, assister_agency_profile: @assister_agency_profile
+  @assister_agency_profile.save!
 end
 
 And(/^a consumer role family exists with assister$/) do
@@ -118,6 +122,16 @@ def assister_agency_profile_with_organization(*traits)
   )
 end
 
+And(/^the existing family has an assister agency account$/) do
+  family = Family.all.first
+  family.assister_agency_accounts.create!(
+    start_on: TimeKeeper.date_of_record,
+    benefit_sponsors_assister_agency_profile_id: @assister_agency_profile.id,
+    writing_agent_id: @assister_agency_profile.primary_assister_role.id
+  )
+  family.save!
+end
+
 And(/^assister lands on assister agency home page$/) do
   visit benefit_sponsors.profiles_assister_agencies_assister_agency_profile_path(id: @assister_agency_profile)
 end
@@ -183,7 +197,7 @@ def assister_agency_profile_with_organization(*traits)
 end
 
 Then(/^Hbx Admin is on Assister Index and clicks Assister Agencies$/) do
-  find('.interaction-click-control-assister-agencies').click
+  find('.interaction-click-control-assister-organizations').click
 end
 
 Then(/^Hbx Admin clicks on the current assister applicant show button$/) do
diff --git a/lib/tasks/me_define_permissions.rake b/lib/tasks/me_define_permissions.rake
index 644a79f15b1..033ea053759 100644
--- a/lib/tasks/me_define_permissions.rake
+++ b/lib/tasks/me_define_permissions.rake
@@ -185,6 +185,12 @@ namespace :me_permissions do
   MeDefinePermissions.define_task :hbx_admin_can_reprint_tax_documents => :environment
 end
 
+# RAILS_ENV=production bundle exec rake me_permissions:hbx_admin_can_create_assister_agency
+namespace :me_permissions do
+  desc 'assign the most current permissions'
+  MeDefinePermissions.define_task :hbx_admin_can_create_assister_agency => :environment
+end
+
 #rake me_permissions:hbx_admin_can_reset_password
 
 #rake me_permissions:hbx_admin_access_new_consumer_application_sub_tab
diff --git a/spec/controllers/insured/families_controller_spec.rb b/spec/controllers/insured/families_controller_spec.rb
index 78e65a315a3..458c593e034 100644
--- a/spec/controllers/insured/families_controller_spec.rb
+++ b/spec/controllers/insured/families_controller_spec.rb
@@ -1448,6 +1448,50 @@ def current_msg_for_employer
         expect(family.current_assister_agency).to be nil
       end
     end
+
+    context "when logged in as a broker" do
+      # a broker should be able to remove an assister from their own family
+      # a broker should not be able to remove an assister from a family they are not the primary for
+      let(:broker_person) { FactoryBot.create(:person, :with_consumer_role) }
+      let(:user) { FactoryBot.create(:user, person: broker_person) }
+      let(:broker_family) { FactoryBot.create(:family, :with_primary_family_member, person: broker_person) }
+      let(:consumer_person) { FactoryBot.create(:person) }
+      let(:family) { FactoryBot.build(:family, :with_primary_family_member, person: consumer_person) }
+      let(:broker_agency_profile) { FactoryBot.build(:benefit_sponsors_organizations_broker_agency_profile) }
+      let(:writing_agent) { FactoryBot.create(:broker_role, benefit_sponsors_broker_agency_profile_id: broker_agency_profile.id, person: broker_person) }
+
+      before :each do
+        family.assister_agency_accounts = [
+          FactoryBot.build(:benefit_sponsors_accounts_assister_agency_account, family: family)
+        ]
+        broker_family.assister_agency_accounts = [
+          FactoryBot.build(:benefit_sponsors_accounts_assister_agency_account, family: broker_family)
+        ]
+        family.broker_agency_accounts.new(
+          benefit_sponsors_broker_agency_profile_id: broker_agency_profile.id,
+          writing_agent_id: writing_agent.id,
+          start_on: Time.now,
+          is_active: true
+        )
+        family.save!
+        broker_family.save!
+        sign_in(user)
+      end
+
+      it "should not delete the assister for the consumer family" do
+        delete :delete_consumer_assister, params: {:id => family.id }
+        expect(response).to have_http_status(:redirect)
+        family.reload
+        expect(family.current_assister_agency).not_to be nil
+      end
+
+      it "should delete the assister for the broker family" do
+        delete :delete_consumer_assister, params: {:id => broker_family.id }
+        expect(response).to have_http_status(:redirect)
+        broker_family.reload
+        expect(broker_family.current_assister_agency).to be nil
+      end
+    end
   end
 
   describe 'GET sep_zip_compare', dbclean: :after_each do
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index 3424dd345de..78ff89d93f3 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -95,6 +95,25 @@
     end
   end
 
+  trait :assister_with_person do
+    roles { ["assister"] }
+
+    after :create do |user, evaluator|
+      if user.person.present?
+        staff_role = FactoryBot.build(
+          :assister_agency_staff_role,
+          assister_agency_profile_id: evaluator.organization.assister_agency_profile.id,
+          benefit_sponsors_assister_agency_profile_id: evaluator.organization.assister_agency_profile.id
+        )
+        user.person.assister_agency_staff_roles.push staff_role
+        user.person.emails = [FactoryBot.build(:email, kind: "work")]
+        evaluator.organization.assister_agency_profile.primary_assister_role = FactoryBot.create :assister_role, person: user.person, assister_agency_profile: evaluator.organization.assister_agency_profile
+        evaluator.organization.save
+        user.save
+      end
+    end
+  end
+
   trait :employer do
     transient do
       organization {}