diff --git a/src/components/ChallengeEditor/ChallengeView/index.js b/src/components/ChallengeEditor/ChallengeView/index.js
index 9138aed8..aa7141b3 100644
--- a/src/components/ChallengeEditor/ChallengeView/index.js
+++ b/src/components/ChallengeEditor/ChallengeView/index.js
@@ -39,7 +39,8 @@ const ChallengeView = ({
   onCloseTask,
   projectPhases,
   assignYourselfCopilot,
-  showRejectChallengeModal
+  showRejectChallengeModal,
+  loggedInUser
 }) => {
   const selectedType = _.find(metadata.challengeTypes, { id: challenge.typeId })
   const challengeTrack = _.find(metadata.challengeTracks, { id: challenge.trackId })
@@ -136,7 +137,7 @@ const ChallengeView = ({
             <CopilotField challenge={{
               copilot,
               selfService: challenge.legacy.selfService
-            }} copilots={challengeResources} assignYourselfCopilot={assignYourselfCopilot} showRejectChallengeModal={showRejectChallengeModal} readOnly />
+            }} copilots={challengeResources} assignYourselfCopilot={assignYourselfCopilot} showRejectChallengeModal={showRejectChallengeModal} readOnly loggedInUser={loggedInUser} />
             <div className={cn(styles.row, styles.topRow)}>
               <div className={styles.col}>
                 <span><span
@@ -264,7 +265,8 @@ ChallengeView.propTypes = {
   onCloseTask: PropTypes.func,
   projectPhases: PropTypes.arrayOf(PropTypes.object),
   assignYourselfCopilot: PropTypes.func.isRequired,
-  showRejectChallengeModal: PropTypes.func.isRequired
+  showRejectChallengeModal: PropTypes.func.isRequired,
+  loggedInUser: PropTypes.object
 }
 
 export default withRouter(ChallengeView)
diff --git a/src/components/ChallengeEditor/ChallengeViewTabs/index.js b/src/components/ChallengeEditor/ChallengeViewTabs/index.js
index a6cc75e6..ae890736 100644
--- a/src/components/ChallengeEditor/ChallengeViewTabs/index.js
+++ b/src/components/ChallengeEditor/ChallengeViewTabs/index.js
@@ -250,6 +250,7 @@ const ChallengeViewTabs = ({
           assignYourselfCopilot={assignYourselfCopilot}
           showRejectChallengeModal={showRejectChallengeModal}
           onApproveChallenge={onApproveChallenge}
+          loggedInUser={loggedInUser}
         />
       )}
       {selectedTab === 1 && (
diff --git a/src/components/ChallengeEditor/Copilot-Field/Copilot-Field.module.scss b/src/components/ChallengeEditor/Copilot-Field/Copilot-Field.module.scss
index d50a3f10..c288cf00 100644
--- a/src/components/ChallengeEditor/Copilot-Field/Copilot-Field.module.scss
+++ b/src/components/ChallengeEditor/Copilot-Field/Copilot-Field.module.scss
@@ -44,6 +44,7 @@
       display: flex;
       flex-direction: row;
       flex-wrap: wrap;
+      width: 100%;
 
         div {
           margin-right: 13px;
diff --git a/src/components/ChallengeEditor/Copilot-Field/index.js b/src/components/ChallengeEditor/Copilot-Field/index.js
index 27708d71..9e6392c8 100644
--- a/src/components/ChallengeEditor/Copilot-Field/index.js
+++ b/src/components/ChallengeEditor/Copilot-Field/index.js
@@ -1,18 +1,23 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import { PrimaryButton } from '../../Buttons'
-import styles from './Copilot-Field.module.scss'
 import cn from 'classnames'
 import _ from 'lodash'
+import PropTypes from 'prop-types'
+import React from 'react'
+
+import { PrimaryButton } from '../../Buttons'
 import CopilotCard from '../../CopilotCard'
 
-const CopilotField = ({ copilots, challenge, onUpdateOthers, readOnly, assignYourselfCopilot }) => {
+import styles from './Copilot-Field.module.scss'
+
+const CopilotField = ({ copilots, challenge, onUpdateOthers, readOnly, assignYourselfCopilot, loggedInUser }) => {
   let errMessage = 'Please set a copilot'
   const handleProperty = copilots.handle ? 'handle' : 'memberHandle'
   const selectedCopilot = _.find(copilots, { [handleProperty]: challenge.copilot })
   const selectedCopilotHandle = selectedCopilot ? selectedCopilot[handleProperty] : undefined
   const copilotFee = _.find(challenge.prizeSets, p => p.type === 'copilot', [])
   const selfService = challenge.selfService
+  const copilotIsSelf = loggedInUser && selectedCopilotHandle === loggedInUser.handle
+  const assignButtonText = `${selectedCopilot && copilotIsSelf ? 'Una' : 'A'}ssign Yourself`
+  const showAssignButton = loggedInUser && (!selectedCopilotHandle || copilotIsSelf)
 
   if (readOnly) {
     return (
@@ -22,11 +27,13 @@ const CopilotField = ({ copilots, challenge, onUpdateOthers, readOnly, assignYou
         </div>
         {(selectedCopilot || selfService) && (<div className={cn(styles.field, styles.col2)}>
           {(selectedCopilot && <CopilotCard copilot={selectedCopilot} selectedCopilot={challenge.copilot} key={selectedCopilotHandle} />)}
-          {(selfService && !selectedCopilot && <PrimaryButton
-            text='Assign Yourself'
-            type='info'
-            onClick={assignYourselfCopilot}
-          />)}
+          {((selfService && showAssignButton) && <div>
+            <PrimaryButton
+              text={assignButtonText}
+              type='info'
+              onClick={assignYourselfCopilot}
+            />
+          </div>)}
         </div>)}
       </div>
     )
@@ -67,7 +74,8 @@ CopilotField.propTypes = {
   challenge: PropTypes.shape().isRequired,
   onUpdateOthers: PropTypes.func,
   readOnly: PropTypes.bool,
-  assignYourselfCopilot: PropTypes.func.isRequired
+  assignYourselfCopilot: PropTypes.func.isRequired,
+  loggedInUser: PropTypes.object
 }
 
 export default CopilotField
diff --git a/src/components/ChallengeEditor/index.js b/src/components/ChallengeEditor/index.js
index 9ade3ca7..1f0b67ba 100644
--- a/src/components/ChallengeEditor/index.js
+++ b/src/components/ChallengeEditor/index.js
@@ -1235,7 +1235,8 @@ class ChallengeEditor extends Component {
       projectPhases,
       challengeId,
       assignYourselfCopilot,
-      challengeResources
+      challengeResources,
+      loggedInUser
     } = this.props
     if (_.isEmpty(challenge)) {
       return <div>Error loading challenge</div>
@@ -1517,7 +1518,7 @@ class ChallengeEditor extends Component {
               />
             )}
             {projectDetail.version === 'v4' && <MilestoneField milestones={activeProjectMilestones} onUpdateSelect={this.onUpdateSelect} projectId={projectDetail.id} selectedMilestoneId={selectedMilestoneId} />}
-            <CopilotField challenge={challenge} copilots={copilotResources} onUpdateOthers={this.onUpdateOthers} assignYourselfCopilot={assignYourselfCopilot} />
+            <CopilotField challenge={challenge} copilots={copilotResources} onUpdateOthers={this.onUpdateOthers} assignYourselfCopilot={assignYourselfCopilot} loggedInUser={loggedInUser} />
             <ReviewTypeField
               reviewers={metadata.members}
               challenge={challenge}
diff --git a/src/containers/ChallengeEditor/index.js b/src/containers/ChallengeEditor/index.js
index e3b15ac2..10cfe5fd 100644
--- a/src/containers/ChallengeEditor/index.js
+++ b/src/containers/ChallengeEditor/index.js
@@ -28,8 +28,7 @@ import {
   partiallyUpdateChallengeDetails,
   deleteChallenge,
   createChallenge,
-  replaceResourceInRole,
-  createResource
+  replaceResourceInRole
 } from '../../actions/challenges'
 
 import { loadSubmissions } from '../../actions/challengeSubmissions'
@@ -338,23 +337,28 @@ class ChallengeEditor extends Component {
   }
 
   async assignYourselfCopilot () {
-    const { challengeDetails, loggedInUser, metadata, createResource } = this.props
+    const { challengeDetails, loggedInUser, metadata, replaceResourceInRole } = this.props
 
-    // create the role resource
+    // get the resource roles and new/old resource values
     const copilotRole = getResourceRoleByName(metadata.resourceRoles, 'Copilot')
     const approverRole = getResourceRoleByName(metadata.resourceRoles, 'Approver')
     const screenerRole = getResourceRoleByName(metadata.resourceRoles, 'Primary Screener')
     const copilotHandle = loggedInUser.handle
-    await createResource(challengeDetails.id, copilotRole.id, copilotHandle)
-    await createResource(challengeDetails.id, approverRole.id, copilotHandle)
-    await createResource(challengeDetails.id, screenerRole.id, copilotHandle)
+    const challengeId = challengeDetails.id
+    const oldPilot = challengeDetails.legacy.selfServiceCopilot
+    const newPilot = oldPilot === copilotHandle ? null : copilotHandle
+
+    // replace the roles
+    await replaceResourceInRole(challengeId, copilotRole.id, newPilot, oldPilot)
+    await replaceResourceInRole(challengeId, approverRole.id, newPilot, oldPilot)
+    await replaceResourceInRole(challengeId, screenerRole.id, newPilot, oldPilot)
 
     this.setState({
       challengeDetails: {
         ...challengeDetails,
         legacy: {
           ...challengeDetails.legacy,
-          selfServiceCopilot: copilotHandle
+          selfServiceCopilot: newPilot
         }
       }
     })
@@ -608,7 +612,6 @@ class ChallengeEditor extends Component {
 }
 
 ChallengeEditor.propTypes = {
-  createResource: PropTypes.func.isRequired,
   match: PropTypes.shape({
     path: PropTypes.string,
     params: PropTypes.shape({
@@ -713,8 +716,7 @@ const mapDispatchToProps = {
   deleteChallenge,
   createChallenge,
   replaceResourceInRole,
-  loadProject,
-  createResource
+  loadProject
 }
 
 export default withRouter(