diff --git a/plugins/talk-plugin-local-auth/client/containers/AddEmailAddressDialog.js b/plugins/talk-plugin-local-auth/client/containers/AddEmailAddressDialog.js
index d8ccd18b0..44ee17df7 100644
--- a/plugins/talk-plugin-local-auth/client/containers/AddEmailAddressDialog.js
+++ b/plugins/talk-plugin-local-auth/client/containers/AddEmailAddressDialog.js
@@ -40,7 +40,8 @@ export default compose(
   withData,
   excludeIf(
     ({ root: { me }, inProgress }) =>
+      !me ||
       me.state.status.username.status === 'UNSET' ||
-      !((me && !me.email) || (me && me.email && inProgress))
+      (me.email && !inProgress)
   )
 )(AddEmailAddressDialog);