diff --git a/client/coral-admin/src/actions/auth.js b/client/coral-admin/src/actions/auth.js
index e50273fa6..e233f3112 100644
--- a/client/coral-admin/src/actions/auth.js
+++ b/client/coral-admin/src/actions/auth.js
@@ -7,7 +7,7 @@ import {handleAuthToken} from 'coral-framework/actions/auth';
 // SIGN IN
 //==============================================================================
 
-export const handleLogin = (email, password, recaptchaResponse) => dispatch => {
+export const handleLogin = (email, password, recaptchaResponse) => (dispatch) => {
   dispatch({type: actions.LOGIN_REQUEST});
   const params = {method: 'POST', body: {email, password}};
   if (recaptchaResponse) {
@@ -20,10 +20,10 @@ export const handleLogin = (email, password, recaptchaResponse) => dispatch => {
         return dispatch(checkLoginFailure('not logged in'));
       }
       dispatch(handleAuthToken(token));
-      const isAdmin = !!user.roles.filter(i => i === 'ADMIN').length;
+      const isAdmin = !!user.roles.filter((i) => i === 'ADMIN').length;
       dispatch(checkLoginSuccess(user, isAdmin));
     })
-    .catch(error => {
+    .catch((error) => {
       if (error.translation_key === 'LOGIN_MAXIMUM_EXCEEDED') {
         dispatch({
           type: actions.LOGIN_MAXIMUM_EXCEEDED,
@@ -51,11 +51,11 @@ const forgotPassowordFailure = () => ({
   type: actions.FETCH_FORGOT_PASSWORD_FAILURE
 });
 
-export const requestPasswordReset = email => dispatch => {
+export const requestPasswordReset = (email) => (dispatch) => {
   dispatch(forgotPassowordRequest(email));
   return coralApi('/account/password/reset', {method: 'POST', body: {email}})
     .then(() => dispatch(forgotPassowordSuccess()))
-    .catch(error => dispatch(forgotPassowordFailure(error)));
+    .catch((error) => dispatch(forgotPassowordFailure(error)));
 };
 
 //==============================================================================
@@ -72,12 +72,12 @@ const checkLoginSuccess = (user, isAdmin) => ({
   isAdmin
 });
 
-const checkLoginFailure = error => ({
+const checkLoginFailure = (error) => ({
   type: actions.CHECK_LOGIN_FAILURE,
   error
 });
 
-export const checkLogin = () => dispatch => {
+export const checkLogin = () => (dispatch) => {
   dispatch(checkLoginRequest());
   return coralApi('/auth')
     .then(({user}) => {
@@ -86,10 +86,10 @@ export const checkLogin = () => dispatch => {
         return dispatch(checkLoginFailure('not logged in'));
       }
 
-      const isAdmin = !!user.roles.filter(i => i === 'ADMIN').length;
+      const isAdmin = !!user.roles.filter((i) => i === 'ADMIN').length;
       dispatch(checkLoginSuccess(user, isAdmin));
     })
-    .catch(error => {
+    .catch((error) => {
       console.error(error);
       dispatch(checkLoginFailure(`${error.translation_key}`));
     });
diff --git a/client/coral-admin/src/containers/LayoutContainer.js b/client/coral-admin/src/containers/LayoutContainer.js
index 9885be0ed..31110d3bd 100644
--- a/client/coral-admin/src/containers/LayoutContainer.js
+++ b/client/coral-admin/src/containers/LayoutContainer.js
@@ -58,20 +58,20 @@ class LayoutContainer extends Component {
   }
 }
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   auth: state.auth.toJS(),
   TALK_RECAPTCHA_PUBLIC: state.config
     .get('data')
     .get('TALK_RECAPTCHA_PUBLIC', null)
 });
 
-const mapDispatchToProps = dispatch => ({
+const mapDispatchToProps = (dispatch) => ({
   checkLogin: () => dispatch(checkLogin()),
   fetchConfig: () => dispatch(fetchConfig()),
   handleLogin: (username, password, recaptchaResponse) =>
     dispatch(handleLogin(username, password, recaptchaResponse)),
-  requestPasswordReset: email => dispatch(requestPasswordReset(email)),
-  toggleShortcutModal: toggle => dispatch(toggleShortcutModal(toggle)),
+  requestPasswordReset: (email) => dispatch(requestPasswordReset(email)),
+  toggleShortcutModal: (toggle) => dispatch(toggleShortcutModal(toggle)),
   handleLogout: () => dispatch(logout())
 });
 
diff --git a/client/coral-admin/src/services/PymConnection.js b/client/coral-admin/src/services/PymConnection.js
index 1ac24ec45..ca592b824 100644
--- a/client/coral-admin/src/services/PymConnection.js
+++ b/client/coral-admin/src/services/PymConnection.js
@@ -3,7 +3,7 @@ import Pym from '../../node_modules/pym.js';
 const pym = new Pym.Child({polling: 100});
 export default pym;
 
-export const link = url => e => {
+export const link = (url) => (e) => {
   e.preventDefault();
   pym.sendMessage('navigate', url);
 };
diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index 5e7c72934..b53badf99 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -1,9 +1,7 @@
-import {gql} from 'react-apollo';
 import {pym} from 'coral-framework';
 import * as Storage from '../helpers/storage';
 import * as actions from '../constants/auth';
 import coralApi, {base} from '../helpers/response';
-import client from 'coral-framework/services/client';
 import jwtDecode from 'jwt-decode';
 
 const lang = new I18n(translations);
@@ -11,7 +9,7 @@ import translations from './../translations';
 import I18n from '../../coral-framework/modules/i18n/i18n';
 
 // Dialog Actions
-export const showSignInDialog = () => dispatch => {
+export const showSignInDialog = () => (dispatch) => {
   const signInPopUp = window.open(
     '/embed/stream/login',
     'Login',
@@ -34,7 +32,7 @@ export const showSignInDialog = () => dispatch => {
 
   dispatch({type: actions.SHOW_SIGNIN_DIALOG});
 };
-export const hideSignInDialog = () => dispatch => {
+export const hideSignInDialog = () => (dispatch) => {
   dispatch({type: actions.HIDE_SIGNIN_DIALOG});
   window.close();
 };
@@ -53,7 +51,7 @@ const createUsernameSuccess = () => ({
   type: actions.CREATE_USERNAME_SUCCESS
 });
 
-const createUsernameFailure = error => ({
+const createUsernameFailure = (error) => ({
   type: actions.CREATE_USERNAME_FAILURE,
   error
 });
@@ -63,7 +61,7 @@ export const updateUsername = ({username}) => ({
   username
 });
 
-export const createUsername = (userId, formData) => dispatch => {
+export const createUsername = (userId, formData) => (dispatch) => {
   dispatch(createUsernameRequest());
   coralApi('/account/username', {method: 'PUT', body: formData})
     .then(() => {
@@ -71,26 +69,26 @@ export const createUsername = (userId, formData) => dispatch => {
       dispatch(hideCreateUsernameDialog());
       dispatch(updateUsername(formData));
     })
-    .catch(error => {
+    .catch((error) => {
       dispatch(createUsernameFailure(lang.t(`error.${error.translation_key}`)));
     });
 };
 
-export const changeView = view => dispatch => {
+export const changeView = (view) => (dispatch) => {
   dispatch({
     type: actions.CHANGE_VIEW,
     view
   });
 
   switch (view) {
-    case 'SIGNUP':
-      window.resizeTo(500, 800);
-      break;
-    case 'FORGOT':
-      window.resizeTo(500, 400);
-      break;
-    default:
-      window.resizeTo(500, 550);
+  case 'SIGNUP':
+    window.resizeTo(500, 800);
+    break;
+  case 'FORGOT':
+    window.resizeTo(500, 400);
+    break;
+  default:
+    window.resizeTo(500, 550);
   }
 };
 
@@ -104,7 +102,7 @@ const signInRequest = () => ({
   type: actions.FETCH_SIGNIN_REQUEST
 });
 
-const signInFailure = error => ({
+const signInFailure = (error) => ({
   type: actions.FETCH_SIGNIN_FAILURE,
   error
 });
@@ -113,7 +111,7 @@ const signInFailure = error => ({
 // AUTH TOKEN
 //==============================================================================
 
-export const handleAuthToken = token => dispatch => {
+export const handleAuthToken = (token) => (dispatch) => {
   Storage.setItem('exp', jwtDecode(token).exp);
   Storage.setItem('token', token);
   dispatch({type: 'HANDLE_AUTH_TOKEN'});
@@ -123,20 +121,22 @@ export const handleAuthToken = token => dispatch => {
 // SIGN IN
 //==============================================================================
 
-export const fetchSignIn = formData => dispatch => {
+export const fetchSignIn = (formData) => (dispatch) => {
   dispatch(signInRequest());
   return coralApi('/auth/local', {method: 'POST', body: formData})
     .then(({token}) => {
       dispatch(handleAuthToken(token));
       dispatch(hideSignInDialog());
     })
-    .catch(error => {
+    .catch((error) => {
       if (error.metadata) {
+
         // the user might not have a valid email. prompt the user user re-request the confirmation email
         dispatch(
           signInFailure(lang.t('error.emailNotVerified', error.metadata))
         );
       } else {
+
         // invalid credentials
         dispatch(signInFailure(lang.t('error.emailPasswordError')));
       }
@@ -150,16 +150,16 @@ export const fetchSignIn = formData => dispatch => {
 const signInFacebookRequest = () => ({
   type: actions.FETCH_SIGNIN_FACEBOOK_REQUEST
 });
-const signInFacebookSuccess = user => ({
+const signInFacebookSuccess = (user) => ({
   type: actions.FETCH_SIGNIN_FACEBOOK_SUCCESS,
   user
 });
-const signInFacebookFailure = error => ({
+const signInFacebookFailure = (error) => ({
   type: actions.FETCH_SIGNIN_FACEBOOK_FAILURE,
   error
 });
 
-export const fetchSignInFacebook = () => dispatch => {
+export const fetchSignInFacebook = () => (dispatch) => {
   dispatch(signInFacebookRequest());
   window.open(
     `${base}/auth/facebook`,
@@ -176,7 +176,7 @@ const signUpFacebookRequest = () => ({
   type: actions.FETCH_SIGNUP_FACEBOOK_REQUEST
 });
 
-export const fetchSignUpFacebook = () => dispatch => {
+export const fetchSignUpFacebook = () => (dispatch) => {
   dispatch(signUpFacebookRequest());
   window.open(
     `${base}/auth/facebook`,
@@ -185,7 +185,7 @@ export const fetchSignUpFacebook = () => dispatch => {
   );
 };
 
-export const facebookCallback = (err, data) => dispatch => {
+export const facebookCallback = (err, data) => (dispatch) => {
   if (err) {
     dispatch(signInFacebookFailure(err));
     return;
@@ -207,10 +207,10 @@ export const facebookCallback = (err, data) => dispatch => {
 //==============================================================================
 
 const signUpRequest = () => ({type: actions.FETCH_SIGNUP_REQUEST});
-const signUpSuccess = user => ({type: actions.FETCH_SIGNUP_SUCCESS, user});
-const signUpFailure = error => ({type: actions.FETCH_SIGNUP_FAILURE, error});
+const signUpSuccess = (user) => ({type: actions.FETCH_SIGNUP_SUCCESS, user});
+const signUpFailure = (error) => ({type: actions.FETCH_SIGNUP_FAILURE, error});
 
-export const fetchSignUp = (formData, redirectUri) => dispatch => {
+export const fetchSignUp = (formData, redirectUri) => (dispatch) => {
   dispatch(signUpRequest());
 
   coralApi('/users', {
@@ -221,7 +221,7 @@ export const fetchSignUp = (formData, redirectUri) => dispatch => {
     .then(({user}) => {
       dispatch(signUpSuccess(user));
     })
-    .catch(error => {
+    .catch((error) => {
       let errorMessage = lang.t(`error.${error.message}`);
 
       // if there is no translation defined, just show the error string
@@ -248,7 +248,7 @@ const forgotPasswordFailure = () => ({
   type: actions.FETCH_FORGOT_PASSWORD_FAILURE
 });
 
-export const fetchForgotPassword = email => dispatch => {
+export const fetchForgotPassword = (email) => (dispatch) => {
   dispatch(forgotPasswordRequest(email));
   const redirectUri = pym.parentUrl || location.href;
   coralApi('/account/password/reset', {
@@ -256,14 +256,14 @@ export const fetchForgotPassword = email => dispatch => {
     body: {email, loc: redirectUri}
   })
     .then(() => dispatch(forgotPasswordSuccess()))
-    .catch(error => dispatch(forgotPasswordFailure(error)));
+    .catch((error) => dispatch(forgotPasswordFailure(error)));
 };
 
 //==============================================================================
 // LOGOUT
 //==============================================================================
 
-export const logout = () => dispatch => {
+export const logout = () => (dispatch) => {
   return coralApi('/auth', {method: 'DELETE'}).then(() => {
     dispatch({type: actions.LOGOUT});
     Storage.removeItem('token');
@@ -275,7 +275,7 @@ export const logout = () => dispatch => {
 //==============================================================================
 
 const checkLoginRequest = () => ({type: actions.CHECK_LOGIN_REQUEST});
-const checkLoginFailure = error => ({type: actions.CHECK_LOGIN_FAILURE, error});
+const checkLoginFailure = (error) => ({type: actions.CHECK_LOGIN_FAILURE, error});
 
 const checkLoginSuccess = (user, isAdmin) => ({
   type: actions.CHECK_LOGIN_SUCCESS,
@@ -283,26 +283,26 @@ const checkLoginSuccess = (user, isAdmin) => ({
   isAdmin
 });
 
-export const checkLogin = () => dispatch => {
+export const checkLogin = () => (dispatch) => {
   dispatch(checkLoginRequest());
   coralApi('/auth')
-    .then(result => {
+    .then((result) => {
       if (!result.user) {
         Storage.removeItem('token');
         throw new Error('Not logged in');
       }
 
-      const isAdmin = !!result.user.roles.filter(i => i === 'ADMIN').length;
+      const isAdmin = !!result.user.roles.filter((i) => i === 'ADMIN').length;
       dispatch(checkLoginSuccess(result.user, isAdmin));
     })
-    .catch(error => {
+    .catch((error) => {
       console.error(error);
       dispatch(checkLoginFailure(`${error.translation_key}`));
     });
 };
 
 export const validForm = () => ({type: actions.VALID_FORM});
-export const invalidForm = error => ({type: actions.INVALID_FORM, error});
+export const invalidForm = (error) => ({type: actions.INVALID_FORM, error});
 
 //==============================================================================
 // VERIFY EMAIL
@@ -320,7 +320,7 @@ const verifyEmailFailure = () => ({
   type: actions.VERIFY_EMAIL_FAILURE
 });
 
-export const requestConfirmEmail = (email, redirectUri) => dispatch => {
+export const requestConfirmEmail = (email, redirectUri) => (dispatch) => {
   dispatch(verifyEmailRequest());
   return coralApi('/users/resend-verify', {
     method: 'POST',
@@ -330,7 +330,8 @@ export const requestConfirmEmail = (email, redirectUri) => dispatch => {
     .then(() => {
       dispatch(verifyEmailSuccess());
     })
-    .catch(err => {
+    .catch((err) => {
+
       // email might have already been verifyed
       dispatch(verifyEmailFailure(err));
     });
diff --git a/client/coral-settings/containers/ProfileContainer.js b/client/coral-settings/containers/ProfileContainer.js
index c72536d8a..04e337b47 100644
--- a/client/coral-settings/containers/ProfileContainer.js
+++ b/client/coral-settings/containers/ProfileContainer.js
@@ -25,7 +25,7 @@ class ProfileContainer extends Component {
     };
   }
 
-  handleTabChange = tab => {
+  handleTabChange = (tab) => {
     this.setState({
       activeTab: tab
     });
@@ -44,7 +44,7 @@ class ProfileContainer extends Component {
     }
 
     const localProfile = this.props.user.profiles.find(
-      p => p.provider === 'local'
+      (p) => p.provider === 'local'
     );
     const emailAddress = localProfile && localProfile.id;
 
@@ -96,13 +96,13 @@ const withQuery = graphql(
   }`
 );
 
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
   user: state.user.toJS(),
   asset: state.asset.toJS(),
   auth: state.auth.toJS()
 });
 
-const mapDispatchToProps = dispatch =>
+const mapDispatchToProps = (dispatch) =>
   bindActionCreators({showSignInDialog, checkLogin}, dispatch);
 
 export default compose(