diff --git a/website/client/components/tasks/approvalFooter.vue b/website/client/components/tasks/approvalFooter.vue
index 82f14b56aa..7685e5d831 100644
--- a/website/client/components/tasks/approvalFooter.vue
+++ b/website/client/components/tasks/approvalFooter.vue
@@ -67,7 +67,7 @@ export default {
       } else if (assignedUsersLength > 1 && !this.userIsAssigned) {
         return this.$t('assignedToMembers', {userCount: assignedUsersLength});
       } else if (assignedUsersLength > 1 && this.userIsAssigned) {
-        return this.$t('assignedToYouAndMembers', {userCount: assignedUsersLength});
+        return this.$t('assignedToYouAndMembers', {userCount: assignedUsersLength - 1});
       } else if (this.userIsAssigned) {
         return this.$t('youAreAssigned');
       } else if (assignedUsersLength === 0) {
diff --git a/website/client/components/tasks/taskModal.vue b/website/client/components/tasks/taskModal.vue
index 87a11a04e4..c11cec9fe9 100644
--- a/website/client/components/tasks/taskModal.vue
+++ b/website/client/components/tasks/taskModal.vue
@@ -892,6 +892,12 @@ export default {
     async submit () {
       if (this.newChecklistItem) this.addChecklistItem();
 
+      if (this.groupId) {
+        this.task.group.assignedUsers = this.assignedMembers;
+        this.task.requiresApproval = this.requiresApproval;
+        this.task.group.approval.required = this.requiresApproval;
+      }
+
       if (this.purpose === 'create') {
         if (this.challengeId) {
           this.$store.dispatch('tasks:createChallengeTasks', {
@@ -912,20 +918,11 @@ export default {
             });
           });
           Promise.all(promises);
-
-          this.task.group.assignedUsers = this.assignedMembers;
-
           this.$emit('taskCreated', this.task);
         } else {
           this.createTask(this.task);
         }
       } else {
-        if (this.groupId) {
-          this.task.group.assignedUsers = this.assignedMembers;
-          this.task.requiresApproval = this.requiresApproval;
-          this.task.group.approval.required = this.requiresApproval;
-        }
-
         this.saveTask(this.task);
         this.$emit('taskEdited', this.task);
       }