diff --git a/packages/component-invite/src/controllers/assignCollectionRole.js b/packages/component-invite/src/controllers/assignCollectionRole.js
index aa194324155156c40f30ed7945d2118a51876a8b..6544f3cc93a20ef024074b0994080d17da6bccda 100644
--- a/packages/component-invite/src/controllers/assignCollectionRole.js
+++ b/packages/component-invite/src/controllers/assignCollectionRole.js
@@ -50,15 +50,21 @@ module.exports = async (
     user.assignations = []
     user.assignations.push(assignation)
     user = await user.save()
-    await mailService.setupAssignEmail(
-      user.email,
-      'assign-handling-editor',
-      url,
-    )
 
-    // TODO: create a team and add the team id to the user's teams array
+    try {
+      await mailService.setupAssignEmail(
+        user.email,
+        'assign-handling-editor',
+        url,
+      )
+
+      return res.status(200).json(user)
+    } catch (e) {
+      logger.error(e)
+      return res.status(500).json({ error: 'Mailing could not be sent.' })
+    }
 
-    return res.status(200).json(user)
+    // TODO: create a team and add the team id to the user's teams array
   } catch (e) {
     const notFoundError = await helpers.handleNotFoundError(e, 'user')
     return res.status(notFoundError.status).json({
diff --git a/packages/component-invite/src/controllers/inviteGlobalRole.js b/packages/component-invite/src/controllers/inviteGlobalRole.js
index ea05a8d5c09bf0c2913a9a0c7c55a63b0f33c469..705c0d5563f3a5f047dd56e9fa6e7627bb019450 100644
--- a/packages/component-invite/src/controllers/inviteGlobalRole.js
+++ b/packages/component-invite/src/controllers/inviteGlobalRole.js
@@ -27,14 +27,18 @@ module.exports = async (body, UserModel, res, url) => {
       title,
       UserModel,
     )
+    try {
+      await mailService.setupInviteEmail(
+        newUser.email,
+        'invite',
+        newUser.passwordResetToken,
+        url,
+      )
 
-    await mailService.setupInviteEmail(
-      newUser.email,
-      'invite',
-      newUser.passwordResetToken,
-      url,
-    )
-
-    return res.status(200).json(newUser)
+      return res.status(200).json(newUser)
+    } catch (e) {
+      logger.error(e)
+      return res.status(500).json({ error: 'Mailing could not be sent.' })
+    }
   }
 }
diff --git a/packages/component-mail-service/src/Mail.js b/packages/component-mail-service/src/Mail.js
index e741ac57b57bd2eff0d44b86fc001d677307c5fe..feda512b1dad002710e7a9033ea74b1f39d5c0a6 100644
--- a/packages/component-mail-service/src/Mail.js
+++ b/packages/component-mail-service/src/Mail.js
@@ -27,7 +27,7 @@ module.exports = {
 
     const { htmlBody, textBody } = getEmailBody(emailType, replacements)
 
-    await Email.send(email, subject, textBody, htmlBody)
+    return await Email.send(email, subject, textBody, htmlBody)
   },
   setupAssignEmail: async (email, emailType, dashBoardUrl) => {
     let subject
@@ -46,7 +46,7 @@ module.exports = {
 
     const { htmlBody, textBody } = getEmailBody(emailType, replacements)
 
-    Email.send(email, subject, textBody, htmlBody)
+    return await Email.send(email, subject, textBody, htmlBody)
   },
 }
 
diff --git a/packages/components-faraday/src/components/Admin/AddEditUser.js b/packages/components-faraday/src/components/Admin/AddEditUser.js
index fa5a61a9b74dcd7775b08038897a0cb894f07227..fb1b7883ca15e06c74905142eb81f00b9a5cb7fc 100644
--- a/packages/components-faraday/src/components/Admin/AddEditUser.js
+++ b/packages/components-faraday/src/components/Admin/AddEditUser.js
@@ -19,7 +19,10 @@ const onSubmit = (values, dispatch, { isEdit, history }) => {
   if (!isEdit) {
     const newValues = setAdmin(values)
     return create('/users/invite', newValues)
-      .then(r => history.push('/admin/users'))
+      .then(r => {
+        console.log(r)
+        history.push('/admin/users')
+      })
       .catch(error => {
         const err = get(error, 'response')
         if (err) {
diff --git a/packages/xpub-faraday/app/FaradayApp.js b/packages/xpub-faraday/app/FaradayApp.js
index 17bae212a28d7b223f3926945c39175a98a2dafb..37c4f8bfadc12ac0931e0a25e147f06465778a31 100644
--- a/packages/xpub-faraday/app/FaradayApp.js
+++ b/packages/xpub-faraday/app/FaradayApp.js
@@ -29,6 +29,9 @@ export default compose(
 
 const Root = styled.div`
   font-family: ${props => props.theme.fontInterface};
+  div[open] {
+    width: auto;
+  }
 `
 
 const MainContainer = styled.div`
diff --git a/packages/xpub-faraday/config/mailer.js b/packages/xpub-faraday/config/mailer.js
index b62cdc759efa43df07e795f8f6899b8e725902d9..61822e96e26af7b59b961d290431d1e67c9bc713 100644
--- a/packages/xpub-faraday/config/mailer.js
+++ b/packages/xpub-faraday/config/mailer.js
@@ -4,7 +4,7 @@ module.exports = {
   from: process.env.EMAIL_SENDER,
   transport: {
     SES: new AWS.SES({
-      accessKeyId: process.env.AWS_SES_ACCESS_KEYs,
+      accessKeyId: process.env.AWS_SES_ACCESS_KEY,
       secretAccessKey: process.env.AWS_SES_SECRET_KEY,
       region: process.env.AWS_SES_REGION,
     }),