diff --git a/packages/component-faraday-ui/src/ManuscriptCard.js b/packages/component-faraday-ui/src/ManuscriptCard.js
index 095e959e26d78489305ac9c569adf17342656e72..eb945229f9b95c6a40c807cc07301661dafb8555 100644
--- a/packages/component-faraday-ui/src/ManuscriptCard.js
+++ b/packages/component-faraday-ui/src/ManuscriptCard.js
@@ -73,7 +73,7 @@ const ManuscriptCard = ({
         </Row>
         <Row alignItems="center" justify="flex-start" mb={1}>
           <H4>Handling editor</H4>
-          <Text ml={1} mr={3}>
+          <Text ml={1} mr={3} whiteSpace="nowrap">
             {get(handlingEditor, 'name', 'Unassigned')}
           </Text>
           {handlingEditor && (
@@ -143,6 +143,9 @@ const MainContainer = styled.div`
     [data-tooltipped] {
       overflow: hidden;
     }
+    ${H4} {
+      white-space: nowrap;
+    }
     ${H3} {
       margin-bottom: 0;
       text-overflow: ellipsis;
diff --git a/packages/component-faraday-ui/src/WizardAuthors.js b/packages/component-faraday-ui/src/WizardAuthors.js
index 3be5cad89501e670032295e0efa1937d704af0f7..e2ffb0ed3de1da2fc20744bbb0ac9e2d6e307d0b 100644
--- a/packages/component-faraday-ui/src/WizardAuthors.js
+++ b/packages/component-faraday-ui/src/WizardAuthors.js
@@ -23,8 +23,7 @@ const castToBool = author => ({
 
 const parseEditedAuthors = (editedAuthor, authors) => {
   const newAuthor = castToBool(editedAuthor)
-
-  return authors.map(
+  const newAuthors = authors.map(
     a =>
       a.id === newAuthor.id
         ? newAuthor
@@ -35,6 +34,19 @@ const parseEditedAuthors = (editedAuthor, authors) => {
               : a.isCorresponding,
           },
   )
+
+  const corresponding = newAuthors.find(a => a.isCorresponding)
+  return corresponding
+    ? newAuthors
+    : newAuthors.map(
+        a =>
+          a.isSubmitting
+            ? {
+                ...a,
+                isCorresponding: true,
+              }
+            : a,
+      )
 }
 
 const WizardAuthors = ({