diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/populate.py b/SAS/TMSS/backend/src/tmss/tmssapp/populate.py
index a643e1915475b544b27101a67739341f9a887d3c..b093121ea48a2b251c9b86120c47eeb0f1a99a74 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/populate.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/populate.py
@@ -125,14 +125,15 @@ permission_groups = {'system_setting': [viewsets.AntennaSetViewSet,
 
 if isViewflowEnabled():
     permission_groups['workflow'] = [workflow_viewsets.SchedulingUnitTaskViewSet,
+                                     workflow_viewsets.SchedulingUnitProcessViewSet,
                                      workflow_viewsets.SchedulingUnitTaskAssignViewSet,
                                      workflow_viewsets.SchedulingUnitTaskUnassignViewSet,
-                                     workflow_viewsets.SchedulingUnitTaskExecuteViewSet,
                                      workflow_viewsets.QAReportingTOViewSet,
                                      workflow_viewsets.QAReportingSOSViewSet,
                                      workflow_viewsets.DecideAcceptanceViewSet]
     permission_groups['workflow_piverification'] = [workflow_viewsets.PIVerificationViewSet,
-                                                    workflow_viewsets.SchedulingUnitGetActiveTasksViewSet]
+                                                    workflow_viewsets.SchedulingUnitGetActiveTasksViewSet,
+                                                    workflow_viewsets.SchedulingUnitTaskExecuteViewSet]
 
 
 def populate_choices(apps, schema_editor):
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/pi.verification.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/pi.verification.js
index 6e3094fe416cb22b3dd410e6bac3d2a372ca5bf2..b8be8ea9141f2b5b1328db1dd612775e579cdc8a 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/pi.verification.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/pi.verification.js
@@ -211,7 +211,7 @@ class PIverification extends Component {
                             </div>
                             {!this.props.readOnly && <div className="p-grid" style={{ marginTop: '20px' }}>
                                 <div className="btn-bar">
-                                <Button disabled={this.state.content &&  this.state.comment && this.state.processPermission && this.state.currentWorkflowTask.editPermissions && this.state.currentWorkflowTask.owner_username === this.user.name? false: true } 
+                                <Button disabled={this.state.content &&  this.state.comment && this.state.processPermission && this.state.currentWorkflowTask.owner_username === this.user.name? false: true }
                                     label="Next" className="p-button-primary" icon="pi pi-check" onClick={ this.Next } />
                                 </div>
                                 <div className="btn-bar">
@@ -221,7 +221,7 @@ class PIverification extends Component {
                             </div>}
                             {!this.props.readOnly && 
                                 <>
-                                    {this.state.currentWorkflowTask.editPermissions && this.state.currentWorkflowTask.owner_username === this.user.name? 
+                                    {this.state.currentWorkflowTask.owner_username === this.user.name?
                                     <span></span>: <span style={{color: 'red'}}>* You can only save and proceed next if you are assigned to this workflow step</span>
                                     }
                                 </>