diff --git a/packages/components-faraday/src/components/AuthorList/Author.js b/packages/components-faraday/src/components/AuthorList/Author.js
index 50431f53881dfb2c4e034a4fb6d7a47ae6a8f5f9..1c1901529711f667850e1cbb5cb12fba52df6d46 100644
--- a/packages/components-faraday/src/components/AuthorList/Author.js
+++ b/packages/components-faraday/src/components/AuthorList/Author.js
@@ -52,13 +52,13 @@ export default ({
       </div>
     </div>
     <div className={classnames(classes['button-container'])}>
-      {!isSubmitting && (
+      {editedAuthor < 0 && (
         <div
-          className={classnames(classes['delete-button'])}
-          onClick={removeAuthor(email)}
-          title="Delete author"
+          className={classnames(classes.corresponding)}
+          onClick={setAuthorEdit(index)}
+          title="Edit author"
         >
-          <Icon>trash</Icon>
+          <Icon>edit-2</Icon>
         </div>
       )}
       {!isCorresponding && (
@@ -70,13 +70,13 @@ export default ({
           <Icon>mail</Icon>
         </div>
       )}
-      {editedAuthor < 0 && (
+      {!isSubmitting && (
         <div
-          className={classnames(classes.corresponding)}
-          onClick={setAuthorEdit(index)}
-          title="Edit author"
+          className={classnames(classes['delete-button'])}
+          onClick={removeAuthor(email)}
+          title="Delete author"
         >
-          <Icon>edit-2</Icon>
+          <Icon>trash</Icon>
         </div>
       )}
     </div>
diff --git a/packages/components-faraday/src/components/AuthorList/AuthorAdder.js b/packages/components-faraday/src/components/AuthorList/AuthorAdder.js
index 9c0b574daca8ad5fee00eb81e2a21f0563093f86..5e9587c4091a115ba4184efcf983ec6648317597 100644
--- a/packages/components-faraday/src/components/AuthorList/AuthorAdder.js
+++ b/packages/components-faraday/src/components/AuthorList/AuthorAdder.js
@@ -67,9 +67,8 @@ export default compose(
   connect(state => ({
     currentUser: selectCurrentUser(state),
   })),
-  withProps(({ currentUser }) => {
-    const { admin, email, username } = currentUser
-    if (!admin) {
+  withProps(({ currentUser: { admin, username, email }, authors }) => {
+    if (!admin && authors.length === 0) {
       return {
         initialValues: {
           email,
@@ -80,6 +79,7 @@ export default compose(
   }),
   reduxForm({
     form: 'author',
+    enableReinitialize: true,
     onSubmit: (
       values,
       dispatch,
diff --git a/packages/components-faraday/src/components/AuthorList/AuthorList.js b/packages/components-faraday/src/components/AuthorList/AuthorList.js
index 7a959a6f9423472fa2ff1960ca2d3f172890b28e..a3f1c3f1c7c033cb7a3e677183939f31c4122144 100644
--- a/packages/components-faraday/src/components/AuthorList/AuthorList.js
+++ b/packages/components-faraday/src/components/AuthorList/AuthorList.js
@@ -65,6 +65,7 @@ const Authors = ({
       <SortableList
         dragHandle={DragHandle}
         dropItem={dropItem}
+        editedAuthor={editedAuthor}
         items={authors}
         listItem={Author}
         moveItem={moveAuthor}