diff --git a/app/controllers/components_controller.rb b/app/controllers/components_controller.rb
index 7e5a4805..9e25013d 100644
--- a/app/controllers/components_controller.rb
+++ b/app/controllers/components_controller.rb
@@ -51,7 +51,7 @@ def show
     @component_json = if @effective_permissions
                         @component.to_json(
                           methods: %i[histories memberships metadata inherited_memberships available_members rules
-                                      reviews]
+                                      reviews admins all_users]
                         )
                       else
                         @component.to_json(methods: %i[rules reviews])
@@ -69,6 +69,8 @@ def create
     # save, this makes sure those errors are shown and not overwritten by the
     # component validators.
     if component.errors.empty? && component.save
+      component.admin_name = component_create_params[:admin_name].presence || current_user.name
+      component.admin_email = component_create_params[:admin_email].presence || current_user.email
       component.duplicate_reviews_and_history(component_create_params[:id])
       component.create_rule_satisfactions if component_create_params[:file]
       component.rules_count = component.rules.where(deleted_at: nil).size
@@ -351,7 +353,7 @@ def set_project
   end
 
   def check_permission_to_update_slackchannel
-    return if component_update_params[:component_metadata_attributes][:data]['Slack Channel ID'].blank?
+    return if component_update_params[:component_metadata_attributes]&.dig('data')&.dig('Slack Channel ID').blank?
 
     authorize_admin_component
   end
@@ -365,6 +367,8 @@ def component_update_params
       :title,
       :prefix,
       :description,
+      :admin_name,
+      :admin_email,
       :advanced_fields,
       additional_questions_attributes: [:id, :name, :question_type, :_destroy, { options: [] }],
       component_metadata_attributes: { data: {} }
@@ -385,6 +389,8 @@ def component_create_params
       :release,
       :title,
       :description,
+      :admin_name,
+      :admin_email,
       :file,
       :slack_channel_id,
       file: {}
diff --git a/app/controllers/memberships_controller.rb b/app/controllers/memberships_controller.rb
index fb34244b..eb356119 100644
--- a/app/controllers/memberships_controller.rb
+++ b/app/controllers/memberships_controller.rb
@@ -9,16 +9,13 @@ class MembershipsController < ApplicationController
 
   def create
     # Ensure the current_user has permissions on the Project or component
-    current_user_effective_role = if current_user.admin
-                                    'admin'
-                                  else
-                                    Membership.where(
-                                      membership_type: membership_create_params[:membership_type],
-                                      membership_id: membership_create_params[:membership_id],
-                                      user_id: current_user.id
-                                    ).pick(:role)
-                                  end
-    unless current_user_effective_role == 'admin'
+    project_or_component = if membership_create_params[:membership_type] == 'Project'
+                             Project.find_by(id: membership_create_params[:membership_id])
+                           else
+                             Component.find_by(id: membership_create_params[:membership_id])
+                           end
+
+    unless current_user.admin || current_user.effective_permissions(project_or_component) == 'admin'
       raise(
         NotAuthorizedError,
         "You are not authorized to manage permissions on this #{membership_create_params[:membership_type]}"
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index bdc474b3..b95d9cb4 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -47,7 +47,7 @@ def show
     # projects that a user has permissions to access
     @project.current_user = current_user
     @project_json = @project.to_json(
-      methods: %i[histories memberships metadata components available_components available_members details]
+      methods: %i[histories memberships metadata components available_components available_members details users]
     )
     respond_to do |format|
       format.html
@@ -171,7 +171,9 @@ def project_params
   end
 
   def check_permission_to_update_slackchannel
-    authorize_admin_project if project_params[:project_metadata_attributes][:data]['Slack Channel ID'].present?
+    return if project_params[:project_metadata_attributes]&.dig('data')&.dig('Slack Channel ID').blank?
+
+    authorize_admin_project
   end
 
   def project_name_changed?(current_project_name, project_params)
diff --git a/app/javascript/components/components/ComponentCard.vue b/app/javascript/components/components/ComponentCard.vue
index 124c6969..811f3c69 100644
--- a/app/javascript/components/components/ComponentCard.vue
+++ b/app/javascript/components/components/ComponentCard.vue
@@ -32,119 +32,113 @@
       <b-card-sub-title v-if="component.description" class="my-2">
         {{ component.description }}
       </b-card-sub-title>
-      <p>
+      <p class="mt-4">
         <span v-if="component.admin_name">
-          {{ component.admin_name }}
+          PoC: {{ component.admin_name }}
           {{ component.admin_email ? `(${component.admin_email})` : "" }}
         </span>
         <em v-else>No Component Admin</em>
-
-        <!-- Component actions -->
-        <span>
-          <!-- Open component -->
-          <a :href="`/components/${component.id}`" target="_blank" class="text-body">
-            <i
-              v-b-tooltip.hover
-              class="mdi mdi-open-in-new float-right h5 clickable"
-              aria-hidden="true"
-              title="Open Component"
-            />
-          </a>
-
-          <!-- Remove component -->
+      </p>
+      <!-- Component actions -->
+      <p>
+        <!-- Open component -->
+        <a :href="`/components/${component.id}`" target="_blank" class="text-body">
           <i
-            v-if="actionable && component.id && effectivePermissions == 'admin'"
             v-b-tooltip.hover
-            class="mdi mdi-delete float-right h5 clickable mr-2"
+            class="mdi mdi-open-in-new float-right h5 clickable"
             aria-hidden="true"
-            title="Remove Component"
-            @click="showDeleteConfirmation = !showDeleteConfirmation"
+            title="Open Component"
           />
+        </a>
 
-          <!-- Duplicate component -->
-          <span v-if="actionable && effectivePermissions == 'admin'" class="float-right mr-2">
-            <NewComponentModal
-              :component_to_duplicate="component.id"
-              :project_id="component.project_id"
-              :predetermined_prefix="component.prefix"
-              :predetermined_security_requirements_guide_id="
-                component.security_requirements_guide_id
-              "
-              @projectUpdated="$emit('projectUpdated')"
-            >
-              <template #opener>
-                <i
-                  v-if="component.id"
-                  v-b-tooltip.hover
-                  class="mdi mdi-content-copy h5 clickable"
-                  aria-hidden="true"
-                  title="Duplicate component and create a new version"
-                />
-              </template>
-            </NewComponentModal>
-          </span>
+        <!-- Remove component -->
+        <i
+          v-if="actionable && component.id && effectivePermissions == 'admin'"
+          v-b-tooltip.hover
+          class="mdi mdi-delete float-right h5 clickable mr-2"
+          aria-hidden="true"
+          title="Remove Component"
+          @click="showDeleteConfirmation = !showDeleteConfirmation"
+        />
 
-          <!-- Release component -->
-          <span
-            v-if="actionable && component.id && effectivePermissions == 'admin'"
-            class="float-right mr-2"
+        <!-- Duplicate component -->
+        <span v-if="actionable && effectivePermissions == 'admin'" class="float-right mr-2">
+          <NewComponentModal
+            :component_to_duplicate="component.id"
+            :project_id="component.project_id"
+            :predetermined_prefix="component.prefix"
+            :predetermined_security_requirements_guide_id="component.security_requirements_guide_id"
+            @projectUpdated="$emit('projectUpdated')"
           >
-            <span v-b-tooltip.hover :title="releaseComponentTooltip">
+            <template #opener>
               <i
-                :class="releaseComponentClasses"
+                v-if="component.id"
+                v-b-tooltip.hover
+                class="mdi mdi-content-copy h5 clickable"
                 aria-hidden="true"
-                @click="confirmComponentRelease"
+                title="Duplicate component and create a new version"
               />
-            </span>
+            </template>
+          </NewComponentModal>
+        </span>
+
+        <!-- Release component -->
+        <span
+          v-if="actionable && component.id && effectivePermissions == 'admin'"
+          class="float-right mr-2"
+        >
+          <span v-b-tooltip.hover :title="releaseComponentTooltip">
+            <i
+              :class="releaseComponentClasses"
+              aria-hidden="true"
+              @click="confirmComponentRelease"
+            />
           </span>
+        </span>
 
-          <!-- Export CSV component -->
-          <i
-            v-b-tooltip.hover
-            class="mdi mdi-download h5 float-right mr-2 clickable"
-            aria-hidden="true"
-            title="Export Component as CSV"
-            @click="downloadExport('csv')"
-          />
+        <!-- Export CSV component -->
+        <i
+          v-b-tooltip.hover
+          class="mdi mdi-download h5 float-right mr-2 clickable"
+          aria-hidden="true"
+          title="Export Component as CSV"
+          @click="downloadExport('csv')"
+        />
 
-          <!-- Export XCCDF component -->
-          <i
-            v-b-tooltip.hover
-            class="xccdf-icon h5 float-right mr-2 clickable"
-            aria-hidden="true"
-            title="Export Component as XCCDF"
-            @click="downloadExport('xccdf')"
-          />
+        <!-- Export XCCDF component -->
+        <i
+          v-b-tooltip.hover
+          class="xccdf-icon h5 float-right mr-2 clickable"
+          aria-hidden="true"
+          title="Export Component as XCCDF"
+          @click="downloadExport('xccdf')"
+        />
 
-          <!-- Download InSpec Profile -->
-          <i
-            v-b-tooltip.hover
-            class="inspec-icon h5 float-right mr-2 clickable"
-            aria-hidden="true"
-            title="Download InSpec Profile"
-            @click="downloadExport('inspec')"
-          />
+        <!-- Download InSpec Profile -->
+        <i
+          v-b-tooltip.hover
+          class="inspec-icon h5 float-right mr-2 clickable"
+          aria-hidden="true"
+          title="Download InSpec Profile"
+          @click="downloadExport('inspec')"
+        />
 
-          <!-- Lock all controls in component -->
-          <span
-            v-if="actionable && role_gte_to(effectivePermissions, 'reviewer')"
-            class="float-right mr-2"
-          >
-            <LockControlsModal
-              :component_id="component.id"
-              @projectUpdated="$emit('projectUpdated')"
-            >
-              <template #opener>
-                <i
-                  v-if="component.id"
-                  v-b-tooltip.hover
-                  class="mdi mdi-lock h5 clickable"
-                  aria-hidden="true"
-                  title="Lock component controls"
-                />
-              </template>
-            </LockControlsModal>
-          </span>
+        <!-- Lock all controls in component -->
+        <span
+          v-if="actionable && role_gte_to(effectivePermissions, 'reviewer')"
+          class="float-right mr-2"
+        >
+          <LockControlsModal :component_id="component.id" @projectUpdated="$emit('projectUpdated')">
+            <template #opener>
+              <i
+                v-if="component.id"
+                v-b-tooltip.hover
+                class="mdi mdi-lock h5 clickable"
+                aria-hidden="true"
+                title="Lock component controls"
+              />
+            </template>
+          </LockControlsModal>
         </span>
       </p>
     </b-card>
diff --git a/app/javascript/components/components/NewComponentModal.vue b/app/javascript/components/components/NewComponentModal.vue
index bbd4dfb3..f29accaf 100644
--- a/app/javascript/components/components/NewComponentModal.vue
+++ b/app/javascript/components/components/NewComponentModal.vue
@@ -141,6 +141,25 @@
             <b-form-group label="Description">
               <b-form-textarea v-model="description" placeholder="" rows="3" />
             </b-form-group>
+            <!-- Select PoC -->
+            <b-form-group
+              v-if="project"
+              label="Select the Point of Contact"
+              description="If no user selected, the PoC will be set to the user creating the component"
+            >
+              <vue-simple-suggest
+                ref="userSearch"
+                :list="potentialPocs"
+                display-attribute="name"
+                value-attribute="email"
+                placeholder="Search for eligible PoC..."
+                :filter-by-query="true"
+                :min-length="0"
+                :max-suggestions="0"
+                :number="0"
+                @select="setComponentPoc($refs.userSearch.selected)"
+              />
+            </b-form-group>
             <!-- Slack Channel ID -->
             <b-form-group
               label="Slack Channel ID"
@@ -229,6 +248,9 @@ export default {
       displayedSrgs: [],
       file: null,
       componentKey: 0,
+      potentialPocs: this.project ? this.project.users : [],
+      admin_name: "",
+      admin_email: "",
     };
   },
   computed: {
@@ -279,6 +301,10 @@ export default {
       this.displayedSrgs = [];
       this.$refs["AddComponentModal"].show();
     },
+    setComponentPoc: function (user) {
+      this.admin_email = user.email;
+      this.admin_name = user.name;
+    },
     fetchData: function (_bvModalEvt) {
       axios.get("/srgs").then((response) => {
         this.srgs = response.data;
@@ -395,6 +421,12 @@ export default {
       if (this.description) {
         formData.append("component[description]", this.description);
       }
+      if (this.admin_name) {
+        formData.append("component[admin_name]", this.admin_name);
+      }
+      if (this.admin_email) {
+        formData.append("component[admin_email]", this.admin_email);
+      }
       if (this.slackChannelId) {
         formData.append("component[slack_channel_id]", this.slackChannelId);
       }
diff --git a/app/javascript/components/components/ProjectComponent.vue b/app/javascript/components/components/ProjectComponent.vue
index 16c58588..27c8a5d6 100644
--- a/app/javascript/components/components/ProjectComponent.vue
+++ b/app/javascript/components/components/ProjectComponent.vue
@@ -148,8 +148,18 @@
                     <strong>Description: </strong>{{ component.description }}
                   </p>
                 </div>
+                <div>
+                  <p v-linkified class="ml-2 mb-0 mt-2">
+                    <strong>PoC Name: </strong>{{ component.admin_name }}
+                  </p>
+                </div>
+                <div>
+                  <p v-linkified class="ml-2 mb-0 mt-2">
+                    <strong>PoC Email: </strong>{{ component.admin_email }}
+                  </p>
+                </div>
                 <UpdateComponentDetailsModal
-                  v-if="role_gte_to(effective_permissions, 'author')"
+                  v-if="role_gte_to(effective_permissions, 'admin')"
                   :component="component"
                   @componentUpdated="refreshComponent"
                 />
diff --git a/app/javascript/components/components/UpdateComponentDetailsModal.vue b/app/javascript/components/components/UpdateComponentDetailsModal.vue
index 5305cecd..b9fe0962 100644
--- a/app/javascript/components/components/UpdateComponentDetailsModal.vue
+++ b/app/javascript/components/components/UpdateComponentDetailsModal.vue
@@ -48,6 +48,23 @@
         <b-form-group label="Description">
           <b-form-textarea v-model="description" placeholder="" rows="3" />
         </b-form-group>
+        <!-- Select PoC -->
+        <b-form-group label="Select the Point of Contact">
+          <vue-simple-suggest
+            :key="`componentKey-${component.id}`"
+            ref="userSearch"
+            :value="admin_name"
+            :list="potentialPocs"
+            display-attribute="name"
+            value-attribute="email"
+            placeholder="Search for eligible PoC..."
+            :filter-by-query="true"
+            :min-length="0"
+            :max-suggestions="0"
+            :number="0"
+            @select="setComponentPoc($refs.userSearch.selected)"
+          />
+        </b-form-group>
         <!-- Allow the enter button to submit the form -->
         <b-btn type="submit" class="d-none" @click.prevent="updateComponentDetails()" />
       </b-form>
@@ -59,9 +76,12 @@
 import axios from "axios";
 import FormMixinVue from "../../mixins/FormMixin.vue";
 import AlertMixinVue from "../../mixins/AlertMixin.vue";
+import VueSimpleSuggest from "vue-simple-suggest";
+import "vue-simple-suggest/dist/styles.css";
 
 export default {
   name: "UpdateComponentDetailsModal",
+  components: { VueSimpleSuggest },
   mixins: [AlertMixinVue, FormMixinVue],
   props: {
     component: {
@@ -77,6 +97,9 @@ export default {
       title: this.component.title,
       description: this.component.description,
       prefix: this.component.prefix,
+      potentialPocs: this.component.all_users,
+      admin_name: this.component.admin_name,
+      admin_email: this.component.admin_email,
     };
   },
   methods: {
@@ -87,14 +110,30 @@ export default {
       this.title = this.component.title;
       this.description = this.component.description;
       this.prefix = this.component.prefix;
+      this.potentialPocs = this.component.all_users;
+      this.admin_name = this.component.admin_name;
+      this.admin_email = this.component.admin_email;
     },
     showModal: function () {
       this.$refs["updateComponentDetailsModal"].show();
     },
+    setComponentPoc: function (user) {
+      this.admin_email = user.email;
+      this.admin_name = user.name;
+    },
     updateComponentDetails: function () {
       this.$refs["updateComponentDetailsModal"].hide();
       let payload = { component: {} };
-      ["name", "version", "release", "title", "description", "prefix"].forEach((attr) => {
+      [
+        "name",
+        "version",
+        "release",
+        "title",
+        "description",
+        "prefix",
+        "admin_name",
+        "admin_email",
+      ].forEach((attr) => {
         if (payload.component[attr] !== this[attr]) {
           payload.component[attr] = this[attr];
         }
diff --git a/app/javascript/components/project/Project.vue b/app/javascript/components/project/Project.vue
index de41d426..594e4aab 100644
--- a/app/javascript/components/project/Project.vue
+++ b/app/javascript/components/project/Project.vue
@@ -33,11 +33,13 @@
               <NewComponentModal
                 v-if="role_gte_to(effective_permissions, 'admin')"
                 :project_id="project.id"
+                :project="project"
                 @projectUpdated="refreshProject"
               />
               <NewComponentModal
                 v-if="role_gte_to(effective_permissions, 'admin')"
                 :project_id="project.id"
+                :project="project"
                 :spreadsheet_import="true"
                 @projectUpdated="refreshProject"
               />
diff --git a/app/models/component.rb b/app/models/component.rb
index f62e53d3..80c5313b 100644
--- a/app/models/component.rb
+++ b/app/models/component.rb
@@ -54,6 +54,7 @@ class Component < ApplicationRecord
   belongs_to :component, class_name: 'Component', inverse_of: :child_components, optional: true
   has_many :child_components, class_name: 'Component', inverse_of: :component, dependent: :destroy
   has_many :memberships, -> { includes :user }, inverse_of: :membership, as: :membership, dependent: :destroy
+  has_many :users, through: :memberships
   has_one :component_metadata, dependent: :destroy
 
   has_many :additional_questions, dependent: :destroy
@@ -197,6 +198,12 @@ def update_admin_contact_info
     save if admin_name_changed? || admin_email_changed?
   end
 
+  # Get all members of the Component: this will be the inherited members from the parent
+  # project + the members of the component
+  def all_users
+    (users + project.users).uniq
+  end
+
   ##
   # Get information for users that have admin permission on the component
   #