diff --git a/packages/component-faraday-selectors/src/index.js b/packages/component-faraday-selectors/src/index.js
index 0ab630ff6cb341f42ab8850b631ba4d270f26f10..03e9a4e21b09d85571161d766e5c07cbe878d964 100644
--- a/packages/component-faraday-selectors/src/index.js
+++ b/packages/component-faraday-selectors/src/index.js
@@ -42,10 +42,10 @@ export const canInviteReviewers = (state, collection = {}) => {
     return false
 
   const { id: userId } = selectCurrentUser(state)
-  const isAdmin = currentUserIs(state, 'isAdmin')
+  const isAdminEiC = currentUserIs(state, 'adminEiC')
   const { isAccepted, id: heId } = get(collection, 'handlingEditor', {})
 
-  return isAccepted && (userId === heId || isAdmin)
+  return isAccepted && (userId === heId || isAdminEiC)
 }
 
 const cannotViewReviewersDetails = [
@@ -198,7 +198,12 @@ export const getHERecommendation = (state, collectionId, fragmentId) => {
   )
 }
 
-const canMakeDecisionStatuses = ['submitted', 'pendingApproval']
+const canMakeDecisionStatuses = [
+  'submitted',
+  'pendingApproval',
+  'underReview',
+  'reviewCompleted',
+]
 export const canMakeDecision = (state, collection = {}) => {
   const status = get(collection, 'status', 'draft')
 
diff --git a/packages/component-manuscript/src/components/ManuscriptLayout.js b/packages/component-manuscript/src/components/ManuscriptLayout.js
index fd01d44a1b4009c558fb8900d8991e9bc47f7b04..e39fc095853a9f2ddcfae64c754cd34fe34e13b9 100644
--- a/packages/component-manuscript/src/components/ManuscriptLayout.js
+++ b/packages/component-manuscript/src/components/ManuscriptLayout.js
@@ -200,6 +200,7 @@ const ManuscriptLayout = ({
             getSignedUrl={getSignedUrl}
             highlight={
               reviewerReports.length === 0 &&
+              currentUser.handlingEditor &&
               !cannotViewReviewersDetails.includes(
                 get(collection, 'status', 'draft'),
               )