diff --git a/src/constants/index.js b/src/constants/index.js
index a46a7e77..431787d9 100644
--- a/src/constants/index.js
+++ b/src/constants/index.js
@@ -298,3 +298,9 @@ export const STATUS_OPTIONS = [
  */
 export const DISABLED_DESCRIPTION_MESSAGE =
   "You may not edit a Job Description that is currently posted to Topcoder.com. Please contact support@topcoder.com.";
+
+/**
+ * The media URL to be shown on Interview popup
+ */
+export const INTERVIEW_POPUP_MEDIA_URL =
+  "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4";
diff --git a/src/routes/JobForm/index.jsx b/src/routes/JobForm/index.jsx
index 05bc0a29..880f22e2 100644
--- a/src/routes/JobForm/index.jsx
+++ b/src/routes/JobForm/index.jsx
@@ -8,6 +8,8 @@
 import React, { useState, useEffect } from "react";
 import PT from "prop-types";
 import { toastr } from "react-redux-toastr";
+import _ from "lodash";
+import store from "../../store";
 import Page from "components/Page";
 import PageHeader from "components/PageHeader";
 import { useData } from "hooks/useData";
@@ -61,8 +63,10 @@ const JobForm = ({ teamId, jobId }) => {
 
   // as we are using `PUT` method (not `PATCH`) we have send ALL the fields
   // fields which we don't send would become `null` otherwise
-  const getRequestData = (values) =>
-    _.pick(values, [
+  const getRequestData = (values) => {
+    const externalId = _.get(store.getState(), "authUser.userId");
+    values.externalId = externalId && _.toString(externalId);
+    return _.pick(values, [
       "projectId",
       "externalId",
       "description",
@@ -76,6 +80,7 @@ const JobForm = ({ teamId, jobId }) => {
       "skills",
       "status",
     ]);
+  };
 
   useEffect(() => {
     if (skills && job && !options) {
diff --git a/src/routes/PositionDetails/actions/index.js b/src/routes/PositionDetails/actions/index.js
index 9d34101e..da23e614 100644
--- a/src/routes/PositionDetails/actions/index.js
+++ b/src/routes/PositionDetails/actions/index.js
@@ -8,7 +8,6 @@ import {
   patchCandidateInterview,
 } from "services/teams";
 import { ACTION_TYPE } from "constants";
-import { getFakeInterviews } from "utils/helpers";
 
 /**
  * Load Team Position details (team job)
@@ -22,13 +21,6 @@ export const loadPosition = (teamId, positionId) => ({
   type: ACTION_TYPE.LOAD_POSITION,
   payload: async () => {
     const response = await getPositionDetails(teamId, positionId);
-
-    // inject mock interview data to candidates list
-    for (const candidate of response.data.candidates) {
-      const fakeInterviews = getFakeInterviews(candidate);
-      _.set(candidate, "interviews", fakeInterviews);
-    }
-
     return response.data;
   },
   meta: {
diff --git a/src/routes/PositionDetails/components/InterviewConfirmPopup/index.jsx b/src/routes/PositionDetails/components/InterviewConfirmPopup/index.jsx
index fc287fa4..c2b6ac79 100644
--- a/src/routes/PositionDetails/components/InterviewConfirmPopup/index.jsx
+++ b/src/routes/PositionDetails/components/InterviewConfirmPopup/index.jsx
@@ -6,6 +6,7 @@
 import React from "react";
 import PT from "prop-types";
 import SimpleModal from "components/SimpleModal";
+import { INTERVIEW_POPUP_MEDIA_URL } from "constants";
 import "./styles.module.scss";
 
 function InterviewConfirmPopup({ open, onClose }) {
@@ -38,7 +39,7 @@ function InterviewConfirmPopup({ open, onClose }) {
         </p>
         <video
           controls
-          src="http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4"
+          src={INTERVIEW_POPUP_MEDIA_URL}
           styleName="video"
         />
       </div>
diff --git a/src/routes/PositionDetails/components/InterviewDetailsPopup/index.jsx b/src/routes/PositionDetails/components/InterviewDetailsPopup/index.jsx
index ed7df2fa..28dbf1e6 100644
--- a/src/routes/PositionDetails/components/InterviewDetailsPopup/index.jsx
+++ b/src/routes/PositionDetails/components/InterviewDetailsPopup/index.jsx
@@ -4,8 +4,7 @@
  * Popup that allows user to schedule an interview
  * Calls addInterview action
  */
-import React, { useEffect, useState, useCallback } from "react";
-import { getAuthUserProfile } from "@topcoder/micro-frontends-navbar-app";
+import React, { useCallback } from "react";
 import { Form } from "react-final-form";
 import arrayMutators from "final-form-arrays";
 import { FieldArray } from "react-final-form-arrays";
@@ -21,10 +20,6 @@ import RadioFieldGroup from "components/RadioFieldGroup";
 
 /* Validators for Form */
 
-const validateExists = (value) => {
-  return value ? undefined : "Required";
-};
-
 const validateIsEmail = (value) => {
   if (!value) return undefined;
   return /\S+@\S+\.\S+/.test(value) ? undefined : "Please enter valid email";
@@ -33,11 +28,6 @@ const validateIsEmail = (value) => {
 const validator = (values) => {
   const errors = {};
 
-  errors.myemail =
-    validateExists(values.myemail) || validateIsEmail(values.myemail);
-  errors.email2 =
-    validateExists(values.email2) || validateIsEmail(values.email2);
-
   errors.emails = [];
   if (values.emails) {
     for (const email of values.emails) {
@@ -51,42 +41,28 @@ const validator = (values) => {
 /********************* */
 
 function InterviewDetailsPopup({ open, onClose, candidate, openNext }) {
-  const [isLoading, setIsLoading] = useState(true);
-  const [myEmail, setMyEmail] = useState("");
-  const [myId, setMyId] = useState("");
   const dispatch = useDispatch();
 
-  useEffect(() => {
-    getAuthUserProfile().then((res) => {
-      setMyEmail(res.email || "");
-      setMyId(res.userId);
-      setIsLoading(false);
-    });
-  }, []);
-
   const onSubmitCallback = useCallback(
     async (formData) => {
-      const secondaryEmails =
+      const attendeesList =
         formData.emails?.filter(
           (email) => typeof email === "string" && email.length > 0
         ) || [];
       const interviewData = {
         xaiTemplate: formData.time,
-        attendeesList: [formData.myemail, formData.email2, ...secondaryEmails],
-        round: candidate.interviews.length + 1,
-        createdBy: myId,
+        attendeesList,
       };
 
       await dispatch(addInterview(candidate.id, interviewData));
     },
-    [dispatch, candidate, myId]
+    [dispatch, candidate]
   );
 
-  return isLoading ? null : (
+  return (
     <Form
       initialValues={{
-        myemail: myEmail,
-        time: "30-min-interview",
+        time: "30-minutes",
       }}
       onSubmit={onSubmitCallback}
       mutators={{
@@ -149,11 +125,11 @@ function InterviewDetailsPopup({ open, onClose, candidate, openNext }) {
                 radios={[
                   {
                     label: "30 Minute Interview",
-                    value: "30-min-interview",
+                    value: "30-minutes",
                   },
                   {
                     label: "60 Minute Interview",
-                    value: "60-min-interview",
+                    value: "60-minutes",
                   },
                 ]}
               />
@@ -164,32 +140,6 @@ function InterviewDetailsPopup({ open, onClose, candidate, openNext }) {
                 Please provide email addresses for all parties you would like
                 involved with the interview.
               </p>
-              <FormField
-                field={{
-                  name: "myemail",
-                  type: FORM_FIELD_TYPE.TEXT,
-                  placeholder: "Email Address",
-                  label: "Email Address",
-                  maxLength: 320,
-                  customValidator: true,
-                }}
-              />
-              <FormField
-                field={{
-                  name: "email2",
-                  type: FORM_FIELD_TYPE.TEXT,
-                  placeholder: "Email Address",
-                  label: "Email Address",
-                  maxLength: 320,
-                  customValidator: true,
-                }}
-              />
-              <button
-                styleName="add-more modal-text"
-                onClick={() => push("emails")}
-              >
-                Add more
-              </button>
               <FieldArray name="emails">
                 {({ fields }) => {
                   return fields.map((name, index) => (
@@ -207,18 +157,27 @@ function InterviewDetailsPopup({ open, onClose, candidate, openNext }) {
                           }}
                         />
                       </div>
-                      <span
-                        tabIndex={0}
-                        role="button"
-                        onClick={() => fields.remove(index)}
-                        styleName="remove-item"
-                      >
-                        &times;
-                      </span>
+                      {index > 0 && (
+                        <span
+                          tabIndex={0}
+                          title="Remove"
+                          role="button"
+                          onClick={() => fields.remove(index)}
+                          styleName="remove-item"
+                        >
+                          &times;
+                        </span>
+                      )}
                     </div>
                   ));
                 }}
               </FieldArray>
+              <button
+                styleName="add-more modal-text"
+                onClick={() => push("emails")}
+              >
+                Add more
+              </button>
             </div>
             <div styleName="bottom">
               <p styleName="modal-text">
diff --git a/src/routes/PositionDetails/components/InterviewDetailsPopup/styles.module.scss b/src/routes/PositionDetails/components/InterviewDetailsPopup/styles.module.scss
index bdd9262d..6df0786e 100644
--- a/src/routes/PositionDetails/components/InterviewDetailsPopup/styles.module.scss
+++ b/src/routes/PositionDetails/components/InterviewDetailsPopup/styles.module.scss
@@ -43,7 +43,7 @@
   background: #fff;
   margin: 10px 0 0 0;
   padding: 0;
-  color: blue;
+  color: #0D61BF;
   border: none;
   border-radius: 0;
 
@@ -60,15 +60,17 @@
 }
 
 .array-input {
-  width: 95%
+  width: 100%
 }
 
 .remove-item {
-  display: flex;
-  flex-direction: column;
-  justify-content: flex-end;
-  margin-bottom: 10px;
+  position: absolute;
+  right: 45px;
+  margin-top: 33px;
   font-size: 33px;
   color: #EF476F;
   cursor: pointer;
+  &:focus {
+    outline: none;
+  }
 }
\ No newline at end of file
diff --git a/src/routes/PositionDetails/components/LatestInterview/index.jsx b/src/routes/PositionDetails/components/LatestInterview/index.jsx
index 6a74cc2c..de78b88b 100644
--- a/src/routes/PositionDetails/components/LatestInterview/index.jsx
+++ b/src/routes/PositionDetails/components/LatestInterview/index.jsx
@@ -9,7 +9,7 @@ import "./styles.module.scss";
 import { formatDate } from "utils/format";
 
 function LatestInterview({ interviews }) {
-  if (!interviews.length) {
+  if (!interviews || !interviews.length) {
     return <div></div>;
   }
 
diff --git a/src/routes/PositionDetails/components/PositionCandidates/index.jsx b/src/routes/PositionDetails/components/PositionCandidates/index.jsx
index a84f42f7..ede24193 100644
--- a/src/routes/PositionDetails/components/PositionCandidates/index.jsx
+++ b/src/routes/PositionDetails/components/PositionCandidates/index.jsx
@@ -272,14 +272,15 @@ const PositionCandidates = ({ position, statusFilterKey, updateCandidate }) => {
                         >
                           Schedule Another Interview
                         </Button>
-                        {candidate.interviews.length > 0 && (
-                          <Button
-                            type="secondary"
-                            onClick={() => openPrevInterviewsPopup(candidate)}
-                          >
-                            View Previous Interviews
-                          </Button>
-                        )}
+                        {candidate.interviews &&
+                          candidate.interviews.length > 0 && (
+                            <Button
+                              type="secondary"
+                              onClick={() => openPrevInterviewsPopup(candidate)}
+                            >
+                              View Previous Interviews
+                            </Button>
+                          )}
                       </div>
                     )}
                 </div>
diff --git a/src/routes/PositionDetails/components/PreviousInterviewsPopup/index.jsx b/src/routes/PositionDetails/components/PreviousInterviewsPopup/index.jsx
index a7e29271..eb6aeed7 100644
--- a/src/routes/PositionDetails/components/PreviousInterviewsPopup/index.jsx
+++ b/src/routes/PositionDetails/components/PreviousInterviewsPopup/index.jsx
@@ -15,7 +15,7 @@ function PreviousInterviewsPopup(props) {
 
   // sorts interviews and returns list of PrevInterviewItems
   const showPrevInterviews = (interviews) => {
-    const sortedInterviews = interviews
+    const sortedInterviews = (interviews || [])
       .slice()
       .sort((a, b) => a.round - b.round);
 
diff --git a/src/services/teams.js b/src/services/teams.js
index 97133c8f..58ae0295 100644
--- a/src/services/teams.js
+++ b/src/services/teams.js
@@ -3,7 +3,6 @@
  */
 import { axiosInstance as axios } from "./requestInterceptor";
 import config from "../../config";
-import { generateInterview } from "utils/helpers";
 
 /**
  * Get my teams.
@@ -68,34 +67,10 @@ export const patchPositionCandidate = (candidateId, partialCandidateData) => {
  * @returns {Promise<object>} interview object
  */
 export const patchCandidateInterview = (candidateId, interviewData) => {
-  // endpoint not currently implemented so response is mocked
-  /*   return axios.patch(
+  return axios.patch(
     `${config.API.V5}/jobCandidates/${candidateId}/requestInterview`,
     interviewData
-  ); */
-
-  const { attendeesList, xaiTemplate, createdBy, round } = interviewData;
-
-  return new Promise((resolve) => {
-    setTimeout(() => {
-      resolve({
-        data: generateInterview({
-          attendeesList,
-          xaiTemplate,
-          jobCandidates: candidateId,
-          updatedBy: "",
-          updatedAt: "",
-          startTimestamp: new Date(
-            Date.now() + 1000 * 60 * 60 * 24 * 3
-          ).toString(), // returns the timestamp 3 days from now
-          createdAt: Date(),
-          createdBy,
-          status: "Scheduling",
-          round,
-        }),
-      });
-    }, 2000);
-  });
+  );
 };
 
 /**
diff --git a/src/utils/helpers.js b/src/utils/helpers.js
index 6c498471..53f24cd2 100644
--- a/src/utils/helpers.js
+++ b/src/utils/helpers.js
@@ -5,8 +5,6 @@
  * If there are multiple methods which could be grouped into a separate file by their meaning they should be extracted from here to not make this file too big.
  */
 import _ from "lodash";
-import faker from "faker";
-import { CANDIDATE_STATUS } from "constants";
 
 /**
  * Delay code for some milliseconds using promise.
@@ -40,67 +38,3 @@ export const getSelectOptionByValue = (value, selectOptions) => {
 
   return option;
 };
-
-/**
- * Generates a pseudorandom integer between two numbers (inclusive)
- *
- * @param {number} lowNum an integer to use as minimun
- * @param {number} highNum an integer to use as maximum
- * @returns {number} a psuedorandom number between low and high
- */
-export const rollDice = (lowNum, highNum) => {
-  const diffPlusOne = highNum - lowNum + 1;
-  return Math.floor(Math.random() * diffPlusOne + lowNum);
-};
-
-/**
- * Generates a fake interview object
- *
- * @param {object} data an optional data object to configure fake interview
- * @returns {object} a fake interview object
- */
-export const generateInterview = (data) => ({
-  id: data.id || faker.datatype.uuid(),
-  googleCalendarId: data.googleCalendarId || "",
-  attendeesList: data.attendeesList || [],
-  startTimestamp: data.startTimestamp || faker.date.recent(),
-  custommessage: data.custommessage || "",
-  xaiTemplate: data.xaiTemplate || "30-min-interview",
-  jobCandidates: data.jobCandidates || faker.datatype.uuid(),
-  round: data.round || 1,
-  status: data.status || "Completed",
-  createdBy: data.createdBy || faker.datatype.uuid(),
-  updatedBy: data.updatedBy || faker.datatype.uuid(),
-  createdAt: data.createdAt || faker.date.past(),
-  updatedAt: data.updatedAt || faker.date.past(),
-});
-
-/**
- * Gets fake interviews to attach to jobCandidates
- *
- * @param {object} candidate a jobCandidate object
- * @returns {object[]} an array of fake interviews
- */
-export const getFakeInterviews = (candidate) => {
-  // If candidate still to review return empty array
-  if (candidate.status === CANDIDATE_STATUS.OPEN) {
-    return [];
-  }
-
-  // decide how many interviews to return
-  const numInterviews = rollDice(0, 3);
-
-  const interviews = [];
-  for (let i = 0; i < numInterviews; i++) {
-    const numEmails = rollDice(2, 6);
-    const emails = _.times(numEmails, faker.internet.exampleEmail);
-
-    const interview = generateInterview({
-      attendeesList: emails,
-      jobCandidates: candidate.id,
-      round: i + 1,
-    });
-    interviews.push(interview);
-  }
-  return interviews;
-};