diff --git a/dashboard-prime/src/components/skills/AddSkillEvent.vue b/dashboard-prime/src/components/skills/AddSkillEvent.vue
index 7a2a5e693..85ba78e1c 100644
--- a/dashboard-prime/src/components/skills/AddSkillEvent.vue
+++ b/dashboard-prime/src/components/skills/AddSkillEvent.vue
@@ -1,8 +1,211 @@
 <script setup>
+import { computed, onMounted, ref, nextTick, watch } from 'vue'
+import { useAppConfig } from '@/common-components/stores/UseAppConfig.js';
+import { useSkillsState } from '@/stores/UseSkillsState.js'
+import { useSkillsAnnouncer } from '@/common-components/utilities/UseSkillsAnnouncer.js'
+import { useRoute, useRouter } from 'vue-router'
+import SkillsService from '@/components/skills/SkillsService.js'
+import SubPageHeader from '@/components/utils/pages/SubPageHeader.vue';
+import ExistingUserInput from '@/components/utils/ExistingUserInput.vue';
+import SkillsCalendarInput from '@/components/utils/inputForm/SkillsCalendarInput.vue'
+import ProjectService from '@/components/projects/ProjectService.js';
+
+const props = defineProps({
+  projectId: String,
+})
+
+const appConfig = useAppConfig()
+const skillsState = useSkillsState()
+const route = useRoute()
+const router = useRouter()
+const announcer = useSkillsAnnouncer()
+
+const dateAdded = ref(new Date());
+const usersAdded = ref([]);
+const isSaving = ref(false);
+const isLoading = ref(true);
+const currentSelectedUser = ref(null);
+const projectTotalPoints = ref(0);
+const pkiAuthenticated = ref(false);
+
+const reversedUsersAdded = computed(() => {
+  return usersAdded.value.map((e) => e)
+      .reverse();
+});
+const minimumPoints = computed(() => {
+  return appConfig.minimumProjectPoints;
+});
+const disable = computed(() => {
+  return (!currentSelectedUser || !currentSelectedUser.value || !currentSelectedUser.value.userId || currentSelectedUser.value.userId.length === 0)
+      || projectTotalPoints.value < minimumPoints.value
+      || (skillsState?.groupId && !skillsState?.enabled);
+});
+const minPointsTooltip = computed(() => {
+  let text = '';
+
+  if (skillsState?.groupId && !skillsState?.enabled) {
+    text = 'Unable to add skill for user. This skill belongs to a group whose current status is disabled';
+  } else if (projectTotalPoints.value < minimumPoints.value) {
+    text = 'Unable to add skill for user. Insufficient available points in project.';
+  }
+  return text;
+});
+const addButtonIcon = computed(() => {
+  if (projectTotalPoints.value >= minimumPoints.value) {
+    return isSaving.value ? 'fa fa-circle-notch fa-spin fa-3x-fa-fw' : 'fas fa-arrow-circle-right';
+  }
+  return 'icon-warning fa fa-exclamation-circle text-warning';
+});
+
+const newUserObjNoSpacesValidatorInNonPkiMode = (value) => {
+  console.log(`vee-validating value: ${JSON.stringify(value)}`);
+  if (pkiAuthenticated.value || !value.userId) {
+    return true;
+  }
+  const hasSpaces = value.userId.indexOf(' ') >= 0;
+  return !hasSpaces;
+}
+
+const schema = yup.object().shape({
+  'userIdInput': yup.mixed().transform((value, input, ctx) => {
+        if (typeof value === 'string') {
+          return {
+            userId: value,
+          }
+        }
+        return value;
+      })
+      .required()
+      .test('newUserObjNoSpacesValidatorInNonPkiMode', 'User Id may not contain spaces', (value) => newUserObjNoSpacesValidatorInNonPkiMode(value))
+      .label('User Id'),
+  'eventDatePicker': yup.date()
+      .required()
+      .label('Event Date'),
+})
+
+const { values, meta, handleSubmit, isSubmitting, setFieldValue, validate, errors, resetForm } = useForm({
+  validationSchema: schema,
+  initialValues: {
+    userIdInput: null,
+    eventDatePicker: dateAdded.value
+  }
+})
+
+onMounted(() => {
+  isLoading.value = true;
+  loadProject()
+  pkiAuthenticated.value = appConfig.isPkiAuthenticated.value;
+});
+
+const loadProject = () => {
+  ProjectService.getProject(props.projectId).then((res) => {
+    projectTotalPoints.value = res.totalPoints;
+    isLoading.value = false;
+  });
+}
+const addSkill = () => {
+  isSaving.value = true;
+  SkillsService.saveSkillEvent(route.params.projectId, route.params.skillId, currentSelectedUser.value, dateAdded.value.getTime(), pkiAuthenticated.value)
+      .then((data) => {
+        isSaving.value = false;
+        const historyObj = {
+          success: data.skillApplied,
+          msg: data.explanation,
+          userId: currentSelectedUser.value.userId,
+          userIdForDisplay: currentSelectedUser.value.userIdForDisplay,
+          key: currentSelectedUser.value.userId + new Date().getTime() + data.skillApplied,
+        };
+        const { userId } = currentSelectedUser.value;
+        if (!data.skillApplied) {
+          nextTick(() => announcer.polite(`Could not add Skill event for ${userId}, ${data.explanation}`));
+        } else {
+          nextTick(() => announcer.polite(`Skill event has been added for ${userId}`));
+        }
+        usersAdded.value.push(historyObj);
+        // currentSelectedUser.value = null;
+        resetForm();
+      })
+      .catch((e) => {
+        const hasErrorCode = e.response.data && e.response.data.errorCode;
+        if (hasErrorCode && (e.response.data.errorCode === 'UserNotFound' || e.response.data.errorCode === 'SkillEventForQuizSkillIsNotAllowed')) {
+          isSaving.value = false;
+          const historyObj = {
+            success: false,
+            msg: e.response.data.explanation,
+            userId: currentSelectedUser.value.userId,
+            userIdForDisplay: currentSelectedUser.value.userIdForDisplay,
+            key: currentSelectedUser.value.userId + new Date().getTime() + false,
+          };
+          usersAdded.value.push(historyObj);
+          // currentSelectedUser.value = null;
+          resetForm();
+        } else {
+          const errorMessage = (e.response && e.response.data && e.response.data.message) ? e.response.data.message : undefined;
+          router.push({ name: 'ErrorPage', query: { errorMessage } });
+        }
+      })
+      .finally(() => {
+        isSaving.value = false;
+      });
+}
 </script>
 
 <template>
-  <div>Add Skill Event</div>
+  <div>
+    <SubPageHeader title="Add Skill Events" />
+    <Card>
+      <template #content>
+        <div class="flex flex-wrap align-items-start">
+          <div class="flex flex-1 px-1">
+            <existing-user-input class="w-full"
+                                 :project-id="projectId"
+                                 v-model="currentSelectedUser"
+                                 :can-enter-new-user="!pkiAuthenticated"
+                                 name="userIdInput"
+                                 aria-errormessage="userIdInputError"
+                                 aria-describedby="userIdInputError"
+                                 :aria-invalid="!meta.valid"
+                                 data-cy="userIdInput" />
+          </div>
+          <div class="flex">
+            <SkillsCalendarInput class="mx-2 my-0" selectionMode="single" name="eventDatePicker" v-model="dateAdded" data-cy="eventDatePicker"
+                                 :max-date="new Date()" aria-required="true" aria-label="event date" ref="eventDatePicker" />
+          </div>
+          <div class="flex">
+            <SkillsButton
+                aria-label="Add Specific User"
+                data-cy="addSkillEventButton"
+                @click="addSkill"
+                :disabled="!meta.valid || disable"
+                :icon="addButtonIcon" label="Add">
+            </SkillsButton>
+          </div>
+        </div>
+        <Message v-if="!isLoading && minPointsTooltip" severity="warn" :closable="false">{{ minPointsTooltip }}</Message>
+<!--        <div>-->
+<!--          <div>Errors: {{ JSON.stringify(errors) }}</div>-->
+<!--          <div>Meta: {{ JSON.stringify(meta) }}</div>-->
+<!--          <div>Values: {{ JSON.stringify(values) }}, disable {{ disable }}</div>-->
+<!--          <div>disable: {{ disable }}</div>-->
+<!--          <div>currentSelectedUser: {{ currentSelectedUser }}</div>-->
+<!--        </div>-->
+        <div class="mt-2" v-for="(user) in reversedUsersAdded" v-bind:key="user.key" data-cy="addedUserEventsInfo">
+          <div class="">
+            <span :class="[user.success ? 'text-green-500' : 'text-red-500']" style="font-weight: bolder">
+              <i :class="[user.success ? 'fa fa-check' : 'fa fa-info-circle']" aria-hidden="true"/>
+              <span v-if="user.success">
+                Added points for
+              </span>
+              <span v-else>
+                Unable to add points for
+              </span>
+              <span>[{{user.userIdForDisplay ? user.userIdForDisplay : user.userId }}]</span>
+            </span><span v-if="!user.success"> - {{user.msg}}</span>
+          </div>
+        </div>
+      </template>
+    </Card>
+  </div>
 </template>
 
 <style scoped></style>
diff --git a/dashboard-prime/src/components/utils/ExistingUserInput.vue b/dashboard-prime/src/components/utils/ExistingUserInput.vue
index d515ab9fd..fea3bf66f 100644
--- a/dashboard-prime/src/components/utils/ExistingUserInput.vue
+++ b/dashboard-prime/src/components/utils/ExistingUserInput.vue
@@ -6,6 +6,9 @@ import { useAppConfig } from '@/common-components/stores/UseAppConfig.js';
 import { useUserInfo } from '@/components/utils/UseUserInfo.js';
 import { useFocusState } from '@/stores/UseFocusState.js';
 import AccessService from '@/components/access/AccessService.js';
+import { useField } from 'vee-validate';
+import AutoComplete from 'primevue/autocomplete';
+import { useSkillsInputFallthroughAttributes } from '@/components/utils/inputForm/UseSkillsInputFallthroughAttributes.js';
 
 // user type constants
 const DASHBOARD = 'DASHBOARD';
@@ -46,9 +49,18 @@ const props = defineProps({
     type: Array,
     default: () => ([]),
   },
+  canEnterNewUser: {
+    type: Boolean,
+    default: false,
+  },
+  modelValue: Object,
+  name: {
+    type: String,
+    default: 'userIdInput',
+  }
 });
 
-const model = defineModel()
+const emit = defineEmits(['update:modelValue']);
 const selectedSuggestOption = ref(null);
 const userSuggestOptions = ref([]);
 
@@ -110,10 +122,17 @@ const getUserIdForDisplay = (user) => {
   }
   return user.userIdForDisplay;
 }
+
+const suggestUsersFromEvent = ({query}) => {
+  suggestUsers(query)
+}
 const suggestUsers = (query) => {
   isFetching.value = true;
   AccessService.suggestUsers(query, suggestUrl.value)
       .then((suggestedUsers) => {
+        if (query && props.canEnterNewUser) {
+          // suggestedUsers.push({ userId: query, label: query });
+        }
         suggestions.value = suggestedUsers.filter((suggestedUser) => !props.excludedSuggestions.includes(suggestedUser.userId));
         suggestions.value = suggestions.value.map((suggestedUser) => {
           const label = getUserIdForDisplay(suggestedUser);
@@ -129,39 +148,84 @@ const suggestUsers = (query) => {
       });
 }
 
+const createTagIfNecessary = (userId) => {
+  console.log(`createTagIfNecessary: ${JSON.stringify(userId)}, type [${typeof userId}]`);
+  if (!userId) {
+    value.value = null;
+  } else if (userId && typeof userId === 'string') {
+    console.log(`Before string userId: ${userId}, value[${JSON.stringify(value.value)}]`);
+    value.value = {
+      userId: userId,
+      label: userId,
+    };
+    console.log(`After string userId: ${userId}, value[${JSON.stringify(value.value)}]`);
+  } else {
+    console.log(`Before non-string userId: ${userId}, value[${JSON.stringify(value.value)}]`);
+    value.value = userId;
+    console.log(`After string userId: ${userId}, value[${JSON.stringify(value.value)}]`);
+  }
+  emit('update:modelValue', value.value);
+}
+
+const fallthroughAttributes = useSkillsInputFallthroughAttributes()
+const { value, errorMessage } = useField(() => props.name)
+//     , undefined, {
+//   syncVModel: true,
+// });
+const useDropdown = false;
+const currentSelectedUser = ref('');
 </script>
 
 <template>
 
-  <div data-cy="existingUserInput">
-    <InputGroup class="">
-      <InputGroupAddon v-if="hasUserSuggestOptions" class="p-1">
-        <Dropdown class="" v-model="selectedSuggestOption" :options="userSuggestOptions"/>
-      </InputGroupAddon>
-      <Dropdown id="existingUserInput"
-                class="align-items-center"
-                v-model="model"
+  <div data-cy="existingUserInput" v-bind="fallthroughAttributes.rootAttrs.value">
+    <div class="flex">
+<!--    <InputGroup class="">-->
+<!--      <InputGroupAddon v-if="hasUserSuggestOptions" class="p-0">-->
+        <Dropdown data-cy="userSuggestOptionsDropdown" v-model="selectedSuggestOption" :options="userSuggestOptions"/>
+<!--      </InputGroupAddon>-->
+      <Dropdown v-if="useDropdown"
+                v-model="currentSelectedUser"
+                id="existingUserInput"
+                data-cy="existingUserInputDropdown"
+                class="align-items-center w-full"
+                @update:modelValue="createTagIfNecessary"
                 :options="suggestions"
                 :loading="isFetching"
                 :placeholder="placeholder"
                 :reset-filter-on-clear="false"
                 :reset-filter-on-hide="true"
-                :auto-filter-focus="true"
+                :auto-filter-focus="!canEnterNewUser"
+                :editable="canEnterNewUser"
                 optionLabel="label"
                 show-clear
                 @filter="onFilter"
                 @before-show="onBeforeShow"
                 filter>
-        <template #value="slotProps">
-          <span v-if="slotProps.value">
-            {{ slotProps.value.label }}
-          </span>
-          <span v-else>
-            {{ slotProps.placeholder }}
-        </span>
-        </template>
       </Dropdown>
-    </InputGroup>
+
+      <AutoComplete v-if="!useDropdown"
+                    v-bind="fallthroughAttributes.inputAttrs.value"
+                    v-model="currentSelectedUser"
+                    data-cy="existingUserInputDropdown"
+                    class="w-full"
+                    :dropdown="true"
+                    :suggestions="suggestions"
+                    optionLabel="label"
+                    @item-select="(event) => console.log(`item-select: ${JSON.stringify(event)}`)"
+                    @item-unselect="(event) => console.log(`item-unselect: ${JSON.stringify(event)}`)"
+                    @update:modelValue="createTagIfNecessary"
+                    @complete="suggestUsersFromEvent"
+                    @dropdownClick="onBeforeShow">
+      </AutoComplete>
+
+<!--    </InputGroup>-->
+    </div>
+    <small v-if="errorMessage"
+           role="alert"
+           class="p-error"
+           :data-cy="`${name}Error`"
+           :id="`${name}Error`">{{ errorMessage || '&nbsp;' }}</small>
   </div>
 </template>
 
diff --git a/dashboard-prime/src/components/utils/inputForm/SkillsCalendarInput.vue b/dashboard-prime/src/components/utils/inputForm/SkillsCalendarInput.vue
index 1efe262ba..1464d603c 100644
--- a/dashboard-prime/src/components/utils/inputForm/SkillsCalendarInput.vue
+++ b/dashboard-prime/src/components/utils/inputForm/SkillsCalendarInput.vue
@@ -16,7 +16,7 @@ const props = defineProps({
   },
   label: {
     type: String,
-    required: true
+    required: false
   },
   isRequired: {
     type: Boolean,
@@ -46,7 +46,7 @@ const handleOnInput = (event) => {
 
 <template>
   <div class="field" v-bind="fallthroughAttributes.rootAttrs.value">
-    <label :for="`input${name}`" class="block"><span v-if="isRequired">*</span> {{ label }} </label>
+    <label v-if="label" :for="`input${name}`" class="block"><span v-if="isRequired">*</span> {{ label }} </label>
     <Calendar v-model="value"
               v-bind="fallthroughAttributes.inputAttrs.value"
               @keydown.enter="onEnter"
@@ -55,6 +55,7 @@ const handleOnInput = (event) => {
               :id="name"
               :data-cy="$attrs['data-cy'] || name" />
     <small
+        v-if="errorMessage"
         role="alert"
         class="p-error block"
         :data-cy="`${name}Error`"
diff --git a/e2e-tests/cypress/e2e/quiz/quiz_skill_assignment_spec.js b/e2e-tests/cypress/e2e/quiz/quiz_skill_assignment_spec.js
index 0908dae09..a261baf1a 100644
--- a/e2e-tests/cypress/e2e/quiz/quiz_skill_assignment_spec.js
+++ b/e2e-tests/cypress/e2e/quiz/quiz_skill_assignment_spec.js
@@ -270,7 +270,7 @@ describe('Quiz Skill Assignment Tests', () => {
         cy.get('li.p-dropdown-empty-message').contains('No results')
     });
 
-    it.skip('reporting to quiz-based skill is not allowed', function () {
+    it('reporting to quiz-based skill is not allowed', function () {
         cy.createQuizDef(1, { name: 'Trivia Knowledge' });
         cy.createQuizQuestionDef(1, 1);
 
@@ -279,9 +279,9 @@ describe('Quiz Skill Assignment Tests', () => {
         cy.createSkill(1, 1, 1, { selfReportingType: 'Quiz', quizId: 'quiz1',  pointIncrement: '150', numPerformToCompletion: 1 });
         cy.visit('/administrator/projects/proj1/subjects/subj1/skills/skill1/addSkillEvent');
         cy.get('[data-cy="pageHeader"]').contains('Very Great Skill 1')
-        const userIdSelector = '[data-cy=userIdInput]';
+        const userIdSelector = '[data-cy="userIdInput"] [data-cy="existingUserInputDropdown"]';
         const addButtonSelector = '[data-cy=addSkillEventButton]';
-        cy.get(`${userIdSelector} input`).should('be.enabled')
+        cy.get(`${userIdSelector} [data-pc-section="input"]`).should('be.enabled')
         cy.get(userIdSelector).type('oTHIGHJK{enter}');
         cy.get(addButtonSelector).should('not.be.disabled')
         cy.get(addButtonSelector).click();
diff --git a/e2e-tests/cypress/e2e/skills_spec.js b/e2e-tests/cypress/e2e/skills_spec.js
index 713eadc36..b1ec393a7 100644
--- a/e2e-tests/cypress/e2e/skills_spec.js
+++ b/e2e-tests/cypress/e2e/skills_spec.js
@@ -19,6 +19,8 @@ import dayjs from 'dayjs'
 
 describe('Skills Tests', () => {
 
+  const addButtonSelector = '[data-cy=addSkillEventButton]';
+  
   beforeEach(() => {
     cy.request('POST', '/app/projects/proj1', {
       projectId: 'proj1',
@@ -340,7 +342,7 @@ describe('Skills Tests', () => {
     cy.get('[data-cy="manageSkillLink_testSkill"]')
   })
 
-  it.skip('Add Skill Event', () => {
+  it('Add Skill Event', () => {
     cy.request('POST', '/admin/projects/proj1/subjects/subj1/skills/skill1', {
       projectId: 'proj1',
       subjectId: 'subj1',
@@ -350,7 +352,6 @@ describe('Skills Tests', () => {
       numPerformToCompletion: '5'
     })
 
-
     cy.intercept({
       method: 'POST',
       url: '/app/users/projects/proj1/suggestClientUsers?userSuggestOption=TWO'
@@ -370,36 +371,36 @@ describe('Skills Tests', () => {
 
     cy.contains('ONE').click()
     cy.contains('TWO').click()
-    cy.get('.existingUserInput button').contains('TWO')
+    cy.get('[data-cy="userSuggestOptionsDropdown"]').contains('TWO')
 
     cy.get('[data-cy="userIdInput"]').click().type('foo{enter}')
     cy.wait('@suggestUsers')
-    cy.clickButton('Add')
-    cy.wait('@addSkillEvent')
-    cy.get('.text-success', { timeout: 5 * 1000 }).contains('Added points for')
-    cy.get('.text-success', { timeout: 5 * 1000 }).contains('[foo]')
+    cy.get(addButtonSelector).click();
+    // cy.wait('@addSkillEvent')
+    cy.get('[data-cy="addedUserEventsInfo"]', { timeout: 5 * 1000 }).contains('Added points for')
+    cy.get('[data-cy="addedUserEventsInfo"]', { timeout: 5 * 1000 }).contains('[foo]')
 
-    cy.get('[data-cy="userIdInput"]').click().type('bar{enter}')
+    cy.get('[data-cy="userIdInput"]').click().type('{selectall}bar{enter}')
     cy.wait('@suggestUsers')
-    cy.clickButton('Add')
-    cy.wait('@addSkillEvent')
-    cy.get('.text-success', { timeout: 5 * 1000 }).contains('Added points for')
-    cy.get('.text-success', { timeout: 5 * 1000 }).contains('[bar]')
+    cy.get(addButtonSelector).click();
+    // cy.wait('@addSkillEvent')
+    cy.get('[data-cy="addedUserEventsInfo"]', { timeout: 5 * 1000 }).contains('Added points for')
+    cy.get('[data-cy="addedUserEventsInfo"]', { timeout: 5 * 1000 }).contains('[bar]')
 
-    cy.get('[data-cy="userIdInput"]').click().type('baz{enter}')
+    cy.get('[data-cy="userIdInput"]').click().type('{selectall}baz{enter}')
     cy.wait('@suggestUsers')
-    cy.clickButton('Add')
-    cy.wait('@addSkillEvent')
-    cy.get('.text-success', { timeout: 5 * 1000 }).contains('Added points for')
-    cy.get('.text-success', { timeout: 5 * 1000 }).contains('[baz]')
+    cy.get(addButtonSelector).click();
+    // cy.wait('@addSkillEvent')  // TODO: uncomment this line once add v-skills directive back
+    cy.get('[data-cy="addedUserEventsInfo"]', { timeout: 5 * 1000 }).contains('Added points for')
+    cy.get('[data-cy="addedUserEventsInfo"]', { timeout: 5 * 1000 }).contains('[baz]')
 
-    cy.get('[data-cy="userIdInput"]').click().type('fo{enter}')
+    cy.get('[data-cy="userIdInput"]').click().type('{selectall}fo{enter}')
     cy.wait('@suggestUsers')
     cy.get('[data-cy="userIdInput"]').click()
-    cy.get('[data-cy="userIdInput"] .vs__dropdown-option').contains('foo').click({ force: true })
+    cy.get('.p-autocomplete-item').contains('foo').click({ force: true })
   })
 
-  it.skip('Add Skill Event for days in past correctly does not subtract one day from selected date', () => {
+  it('Add Skill Event for days in past correctly does not subtract one day from selected date', () => {
     cy.request('POST', '/admin/projects/proj1/subjects/subj1/skills/skill1', {
       projectId: 'proj1',
       subjectId: 'subj1',
@@ -409,7 +410,6 @@ describe('Skills Tests', () => {
       numPerformToCompletion: '5'
     })
 
-
     cy.intercept({
       method: 'POST',
       url: '/app/users/projects/proj1/suggestClientUsers?userSuggestOption=TWO'
@@ -440,19 +440,20 @@ describe('Skills Tests', () => {
     //need to format year/month/day to match users screen
 
     cy.get('[data-cy="eventDatePicker"]').click()
-    cy.get('.vdp-datepicker__calendar .prev').first().click()
-    cy.get('.vdp-datepicker__calendar').contains('10').click()
+    cy.get('[data-pc-section="previousbutton"]').first().click()
+    cy.get('.p-datepicker-group-container').contains('10').click()
 
-    cy.clickButton('Add')
-    cy.wait('@addSkillEvent')
-    cy.get('.text-success', { timeout: 5 * 1000 }).contains('Added points for')
-    cy.get('.text-success', { timeout: 5 * 1000 }).contains('[foo]')
+    cy.get(addButtonSelector).click();
+    // cy.wait('@addSkillEvent') // TODO: uncomment this line once add v-skills directive back
+    cy.get('[data-cy="addedUserEventsInfo"]', { timeout: 5 * 1000 }).contains('Added points for')
+    cy.get('[data-cy="addedUserEventsInfo"]', { timeout: 5 * 1000 }).contains('[foo]')
     cy.get('[data-cy=nav-Users]').click()
-    cy.contains('foo')
-    cy.get('[data-label="Points Last Earned"]').should('contain.text', formattedStr)
+    cy.validateTable('[data-cy=usersTable]', [
+      [{ colIndex: 0,  value: 'foo' }, { colIndex: 3,  value: formattedStr }],
+    ], 5);
   })
 
-  it.skip('Add Skill Event - suggest user with slash character does not cause error', () => {
+  it('Add Skill Event - suggest user with slash character does not cause error', () => {
     cy.request('POST', '/admin/projects/proj1/subjects/subj1/skills/skill1', {
       projectId: 'proj1',
       subjectId: 'subj1',
@@ -462,7 +463,6 @@ describe('Skills Tests', () => {
       numPerformToCompletion: '5'
     })
 
-
     cy.intercept({
       method: 'POST',
       url: '/app/users/projects/proj1/suggestClientUsers?userSuggestOption=TWO'
@@ -478,13 +478,13 @@ describe('Skills Tests', () => {
 
     cy.contains('ONE').click()
     cy.contains('TWO').click()
-    cy.get('.existingUserInput button').contains('TWO')
+    cy.get('[data-cy="userSuggestOptionsDropdown"]').contains('TWO')
 
     cy.get('[data-cy="userIdInput"]').click().type('foo/bar{enter}')
     cy.wait('@suggestUsers')
   })
 
-  it.skip('Add Skill Event User Not Found', () => {
+  it('Add Skill Event User Not Found', () => {
     cy.intercept({
       method: 'PUT',
       path: '/api/projects/*/skills/*'
@@ -515,12 +515,12 @@ describe('Skills Tests', () => {
 
     cy.get('[data-cy="userIdInput"]').click().type('foo{enter}')
 
-    cy.clickButton('Add')
+    cy.get(addButtonSelector).click();
     cy.wait('@addUser')
     cy.get('[data-cy="addedUserEventsInfo"]').contains('Unable to add points for')
   })
 
-  it.skip('Add Skill Event - user names cannot have spaces', () => {
+  it('Add Skill Event - user names cannot have spaces', () => {
     cy.request('POST', '/admin/projects/proj1/subjects/subj1/skills/skill1', {
       projectId: 'proj1',
       subjectId: 'subj1',
@@ -720,7 +720,7 @@ describe('Skills Tests', () => {
     cy.get('[data-cy=editSkillButton_skill1]').should('have.focus')
   })
 
-  it.skip('skill user details does not break breadcrumb bar', () => {
+  it('skill user details does not break breadcrumb bar', () => {
     cy.request('POST', '/admin/projects/proj1/subjects/subj1/skills/skill1', {
       projectId: 'proj1',
       subjectId: 'subj1',
@@ -1380,7 +1380,7 @@ describe('Skills Tests', () => {
     cy.get('[data-cy="descriptionError"]').contains('Mocked up validation failure')
   })
 
-  it.skip('copy skill - run validation on load in case validation improved and existing values fail to validate', () => {
+  it('copy skill - run validation on load in case validation improved and existing values fail to validate', () => {
     cy.intercept('POST', '/api/validation/description*', {
       valid: false,
       msg: 'Mocked up validation failure'