diff --git a/.env.template b/.env.template
index 4313645bb..1fa2a542a 100644
--- a/.env.template
+++ b/.env.template
@@ -1,2 +1 @@
-JWT_SECRET="b/&&7b78BF&fv/Vd"
 MAPBOX_TOKEN="pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ"
diff --git a/docker-compose.yml b/docker-compose.yml
index 64b743698..3b09fa57d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,6 @@ services:
     environment:
       - HOST=0.0.0.0
       - BACKEND_URL=http://backend:4000
-      - JWT_SECRET=b/&&7b78BF&fv/Vd
       - MAPBOX_TOKEN="pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.bZ8KK9l70omjXbEkkbHGsQ"
 
 networks:
diff --git a/package.json b/package.json
index e7b794d83..796f56298 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "nonGlobalStepDefinitions": true
   },
   "jest": {
+    "verbose": true,
     "moduleFileExtensions": [
       "js",
       "json",
@@ -42,7 +43,7 @@
     "@nuxtjs/dotenv": "~1.3.0",
     "@nuxtjs/style-resources": "~0.1.2",
     "accounting": "~0.4.1",
-    "apollo-cache-inmemory": "~1.5.0",
+    "apollo-cache-inmemory": "~1.5.1",
     "apollo-client": "~2.5.1",
     "cookie-universal-nuxt": "~2.0.14",
     "cross-env": "~5.2.0",
@@ -66,7 +67,7 @@
   },
   "devDependencies": {
     "@babel/core": "~7.3.4",
-    "@babel/preset-env": "~7.3.1",
+    "@babel/preset-env": "~7.3.4",
     "@vue/cli-shared-utils": "~3.4.0",
     "@vue/eslint-config-prettier": "~4.0.1",
     "@vue/server-test-utils": "~1.0.0-beta.29",
diff --git a/pages/settings/index.vue b/pages/settings/index.vue
index c018061a9..9f1ec8622 100644
--- a/pages/settings/index.vue
+++ b/pages/settings/index.vue
@@ -48,101 +48,90 @@
 <script>
 import gql from 'graphql-tag'
 
-import { mapGetters } from 'vuex'
+import { mapGetters, mapMutations } from 'vuex'
 import { CancelToken } from 'axios'
 import find from 'lodash/find'
 
 let timeout
 const mapboxToken = process.env.MAPBOX_TOKEN
 
+const query = gql`
+  query getUser($id: ID) {
+    User(id: $id) {
+      id
+      name
+      locationName
+      about
+    }
+  }
+`
+
+const mutation = gql`
+  mutation($id: ID!, $name: String, $locationName: String, $about: String) {
+    UpdateUser(
+      id: $id
+      name: $name
+      locationName: $locationName
+      about: $about
+    ) {
+      id
+      name
+      locationName
+      about
+    }
+  }
+`
+
 export default {
   data() {
     return {
       axiosSource: null,
       cities: [],
       sending: false,
-      form: {
-        name: null,
-        locationName: null,
-        about: null
-      }
+      formData: {}
     }
   },
   computed: {
     ...mapGetters({
-      user: 'auth/user'
-    })
-  },
-  watch: {
-    user: {
-      immediate: true,
-      handler: function(user) {
-        this.form = {
-          name: user.name,
-          locationName: user.locationName,
-          about: user.about
-        }
+      currentUser: 'auth/user'
+    }),
+    form: {
+      get: function() {
+        const { name, locationName, about } = this.currentUser
+        return { name, locationName, about }
+      },
+      set: function(formData) {
+        this.formData = formData
       }
     }
   },
   methods: {
+    ...mapMutations({
+      setCurrentUser: 'auth/SET_USER'
+    }),
     submit() {
       this.sending = true
+      const { name, about } = this.formData
+      let { locationName } = this.formData
+      locationName = locationName && (locationName['label'] || locationName)
       this.$apollo
         .mutate({
-          mutation: gql`
-            mutation(
-              $id: ID!
-              $name: String
-              $locationName: String
-              $about: String
-            ) {
-              UpdateUser(
-                id: $id
-                name: $name
-                locationName: $locationName
-                about: $about
-              ) {
-                id
-                name
-                locationName
-                about
-              }
-            }
-          `,
-          // Parameters
+          mutation,
           variables: {
-            id: this.user.id,
-            name: this.form.name,
-            locationName: this.form.locationName
-              ? this.form.locationName['label'] || this.form.locationName
-              : null,
-            about: this.form.about
+            id: this.currentUser.id,
+            name,
+            locationName,
+            about
           },
-          // Update the cache with the result
-          // The query will be updated with the optimistic response
-          // and then with the real result of the mutation
           update: (store, { data: { UpdateUser } }) => {
-            this.$store.dispatch('auth/fetchCurrentUser')
-
-            // Read the data from our cache for this query.
-            // const data = store.readQuery({ query: TAGS_QUERY })
-            // Add our tag from the mutation to the end
-            // data.tags.push(addTag)
-            // Write our data back to the cache.
-            // store.writeQuery({ query: TAGS_QUERY, data })
+            const { name, locationName, about } = UpdateUser
+            this.setCurrentUser({
+              ...this.currentUser,
+              name,
+              locationName,
+              about
+            })
           }
-          // Optimistic UI
-          // Will be treated as a 'fake' result as soon as the request is made
-          // so that the UI can react quickly and the user be happy
-          /* optimisticResponse: {
-            __typename: 'Mutation',
-            addTag: {
-              __typename: 'Tag',
-              id: -1,
-              label: newTag
-            }
-          } */
         })
         .then(data => {
           this.$toast.success('Updated user')
diff --git a/store/auth.js b/store/auth.js
index a6ab3b3f8..4785ff0c0 100644
--- a/store/auth.js
+++ b/store/auth.js
@@ -57,90 +57,70 @@ export const actions = {
     if (!token) {
       return
     }
-
-    const payload = await jwt.verify(token, process.env.JWT_SECRET)
-    if (!payload.id) {
-      return
-    }
     commit('SET_TOKEN', token)
-    commit('SET_USER', {
-      id: payload.id
-    })
     await dispatch('fetchCurrentUser')
   },
+
   async check({ commit, dispatch, getters }) {
     if (!this.app.$apolloHelpers.getToken()) {
       await dispatch('logout')
     }
     return getters.isLoggedIn
   },
-  async fetchCurrentUser({ commit, getters }) {
-    await this.app.apolloProvider.defaultClient
-      .query({
-        query: gql(`
-          query User($id: ID!) {
-            User(id: $id) {
-              id
-              name
-              slug
-              email
-              avatar
-              role
-              locationName
-              about
-            }
+
+  async fetchCurrentUser({ commit, dispatch }) {
+    const client = this.app.apolloProvider.defaultClient
+    const {
+      data: { currentUser }
+    } = await client.query({
+      query: gql(`{
+          currentUser {
+            id
+            name
+            slug
+            email
+            avatar
+            role
+            about
+            locationName
           }
-        `),
-        variables: { id: getters.user.id }
-      })
-      .then(({ data }) => {
-        const user = data.User.pop()
-        if (user.id && user.email) {
-          commit('SET_USER', user)
-        }
-      })
-    return getters.user
+        }`)
+    })
+    if (!currentUser) return dispatch('logout')
+    commit('SET_USER', currentUser)
+    return currentUser
   },
-  async login({ commit }, { email, password }) {
+
+  async login({ commit, dispatch }, { email, password }) {
     commit('SET_PENDING', true)
     try {
-      const res = await this.app.apolloProvider.defaultClient
-        .mutate({
-          mutation: gql(`
+      const client = this.app.apolloProvider.defaultClient
+      const {
+        data: { login }
+      } = await client.mutate({
+        mutation: gql(`
             mutation($email: String!, $password: String!) {
-              login(email: $email, password: $password) {
-                id
-                name
-                slug
-                email
-                avatar
-                role
-                locationName
-                about
-                token
-              }
+              login(email: $email, password: $password)
             }
           `),
-          variables: { email, password }
-        })
-        .then(({ data }) => data && data.login)
-
-      await this.app.$apolloHelpers.onLogin(res.token)
-      commit('SET_TOKEN', res.token)
-      const userData = Object.assign({}, res)
-      delete userData.token
-      commit('SET_USER', userData)
+        variables: { email, password }
+      })
+      await this.app.$apolloHelpers.onLogin(login)
+      commit('SET_TOKEN', login)
+      await dispatch('fetchCurrentUser')
     } catch (err) {
       throw new Error(err)
     } finally {
       commit('SET_PENDING', false)
     }
   },
+
   async logout({ commit }) {
     commit('SET_USER', null)
     commit('SET_TOKEN', null)
     return this.app.$apolloHelpers.onLogout()
   },
+
   register(
     { dispatch, commit },
     { email, password, inviteCode, invitedByUserId }
diff --git a/store/auth.test.js b/store/auth.test.js
index 98bd1ce13..9b6a33195 100644
--- a/store/auth.test.js
+++ b/store/auth.test.js
@@ -2,23 +2,21 @@ import { getters, mutations, actions } from './auth.js'
 
 let state
 let commit
+let dispatch
 
 const token =
   'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6InUzIiwic2x1ZyI6Implbm55LXJvc3RvY2siLCJuYW1lIjoiSmVubnkgUm9zdG9jayIsImF2YXRhciI6Imh0dHBzOi8vczMuYW1hem9uYXdzLmNvbS91aWZhY2VzL2ZhY2VzL3R3aXR0ZXIvbXV0dV9rcmlzaC8xMjguanBnIiwiZW1haWwiOiJ1c2VyQGV4YW1wbGUub3JnIiwicm9sZSI6InVzZXIiLCJpYXQiOjE1NDUxNDQ2ODgsImV4cCI6MTYzMTU0NDY4OCwiYXVkIjoiaHR0cDovL2xvY2FsaG9zdDozMDAwIiwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo0MDAwIiwic3ViIjoidTMifQ.s5_JeQN9TaUPfymAXPOpbMAwhmTIg9cnOvNEcj4z75k'
-const successfulLoginResponse = {
-  data: {
-    login: {
-      id: 'u3',
-      name: 'Jenny Rostock',
-      slug: 'jenny-rostock',
-      email: 'user@example.org',
-      avatar:
-        'https://s3.amazonaws.com/uifaces/faces/twitter/mutu_krish/128.jpg',
-      role: 'user',
-      token
-    }
-  }
+const currentUser = {
+  id: 'u3',
+  name: 'Jenny Rostock',
+  slug: 'jenny-rostock',
+  email: 'user@example.org',
+  avatar: 'https://s3.amazonaws.com/uifaces/faces/twitter/mutu_krish/128.jpg',
+  role: 'user'
 }
+const successfulLoginResponse = { data: { login: token } }
+const successfulCurrentUserResponse = { data: { currentUser } }
+
 const incorrectPasswordResponse = {
   data: {
     login: null
@@ -39,6 +37,7 @@ const incorrectPasswordResponse = {
 
 beforeEach(() => {
   commit = jest.fn()
+  dispatch = jest.fn(() => Promise.resolve())
 })
 
 describe('getters', () => {
@@ -55,34 +54,67 @@ describe('getters', () => {
 describe('actions', () => {
   let action
 
-  describe('login', () => {
-    describe('given valid credentials and a successful response', () => {
-      beforeEach(async () => {
-        const response = Object.assign({}, successfulLoginResponse)
-        const mutate = jest.fn(() => Promise.resolve(response))
-        const onLogin = jest.fn(() => Promise.resolve())
-        const module = {
-          app: {
-            apolloProvider: { defaultClient: { mutate } },
-            $apolloHelpers: { onLogin }
+  describe('init', () => {
+    const theAction = () => {
+      const module = {
+        app: {
+          $apolloHelpers: {
+            getToken: () => token
           }
         }
-        action = actions.login.bind(module)
-        await action(
-          { commit },
-          { email: 'user@example.org', password: '1234' }
-        )
+      }
+      action = actions.init.bind(module)
+      return action({ commit, dispatch })
+    }
+
+    describe('client-side', () => {
+      beforeEach(() => {
+        process.server = false
       })
 
-      afterEach(() => {
-        action = null
+      it('returns', async () => {
+        await theAction()
+        expect(dispatch.mock.calls).toEqual([])
+        expect(commit.mock.calls).toEqual([])
+      })
+    })
+
+    describe('server-side', () => {
+      beforeEach(() => {
+        process.server = true
       })
 
-      it('saves the JWT Bearer token', () => {
+      it('fetches the current user', async () => {
+        await theAction()
+        expect(dispatch.mock.calls).toEqual([['fetchCurrentUser']])
+      })
+
+      it('saves the JWT Bearer token', async () => {
+        await theAction()
         expect(commit.mock.calls).toEqual(
           expect.arrayContaining([['SET_TOKEN', token]])
         )
       })
+    })
+  })
+
+  describe('fetchCurrentUser', () => {
+    describe('given a successful response', () => {
+      beforeEach(async () => {
+        const module = {
+          app: {
+            apolloProvider: {
+              defaultClient: {
+                query: jest.fn(() =>
+                  Promise.resolve(successfulCurrentUserResponse)
+                )
+              }
+            }
+          }
+        }
+        action = actions.fetchCurrentUser.bind(module)
+        await action({ commit })
+      })
 
       it('saves user data without token', () => {
         expect(commit.mock.calls).toEqual(
@@ -102,6 +134,44 @@ describe('actions', () => {
           ])
         )
       })
+    })
+  })
+
+  describe('login', () => {
+    describe('given valid credentials and a successful response', () => {
+      beforeEach(async () => {
+        const module = {
+          app: {
+            apolloProvider: {
+              defaultClient: {
+                mutate: jest.fn(() => Promise.resolve(successfulLoginResponse))
+              }
+            },
+            $apolloHelpers: {
+              onLogin: jest.fn(() => Promise.resolve())
+            }
+          }
+        }
+        action = actions.login.bind(module)
+        await action(
+          { commit, dispatch },
+          { email: 'user@example.org', password: '1234' }
+        )
+      })
+
+      afterEach(() => {
+        action = null
+      })
+
+      it('saves the JWT Bearer token', () => {
+        expect(commit.mock.calls).toEqual(
+          expect.arrayContaining([['SET_TOKEN', token]])
+        )
+      })
+
+      it('fetches the user', () => {
+        expect(dispatch.mock.calls).toEqual([['fetchCurrentUser']])
+      })
 
       it('saves pending flags in order', () => {
         expect(commit.mock.calls).toEqual(
diff --git a/yarn.lock b/yarn.lock
index 8f738e767..84439c187 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -221,6 +221,16 @@
     "@babel/traverse" "^7.2.3"
     "@babel/types" "^7.0.0"
 
+"@babel/helper-replace-supers@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.3.4.tgz#a795208e9b911a6eeb08e5891faacf06e7013e13"
+  integrity sha512-pvObL9WVf2ADs+ePg0jrqlhHoxRXlOa+SHRHzAXIz2xkYuOHfGl+fKxPMaS4Fq+uje8JQPobnertBBvyrWnQ1A==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.0.0"
+    "@babel/helper-optimise-call-expression" "^7.0.0"
+    "@babel/traverse" "^7.3.4"
+    "@babel/types" "^7.3.4"
+
 "@babel/helper-simple-access@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c"
@@ -323,10 +333,10 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
 
-"@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.3.1":
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.2.tgz#6d1859882d4d778578e41f82cc5d7bf3d5daf6c1"
-  integrity sha512-DjeMS+J2+lpANkYLLO+m6GjoTMygYglKmRe6cDTbFv3L9i6mmiE8fe6B8MtCSLZpVXscD5kn7s6SgtHrDoBWoA==
+"@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.4.tgz#47f73cf7f2a721aad5c0261205405c642e424654"
+  integrity sha512-j7VQmbbkA+qrzNqbKHrBsW3ddFnOeva6wzSe/zB7T+xaxGc+RCpwo44wCmRixAIGRoIpmVgvzFzNJqQcO3/9RA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
@@ -411,10 +421,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-async-to-generator@^7.1.0", "@babel/plugin-transform-async-to-generator@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.2.0.tgz#68b8a438663e88519e65b776f8938f3445b1a2ff"
-  integrity sha512-CEHzg4g5UraReozI9D4fblBYABs7IM6UerAVG7EJVrTLC5keh00aEuLUT+O40+mJCEzaXkYfTCUKIyeDfMOFFQ==
+"@babel/plugin-transform-async-to-generator@^7.1.0", "@babel/plugin-transform-async-to-generator@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.3.4.tgz#4e45408d3c3da231c0e7b823f407a53a7eb3048c"
+  integrity sha512-Y7nCzv2fw/jEZ9f678MuKdMo99MFDJMT/PvD9LisrR5JDFcJH6vYeH6RnjVt3p5tceyGRvTtEN0VOlU+rgHZjA==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -427,25 +437,25 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-block-scoping@^7.0.0", "@babel/plugin-transform-block-scoping@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.2.0.tgz#f17c49d91eedbcdf5dd50597d16f5f2f770132d4"
-  integrity sha512-vDTgf19ZEV6mx35yiPJe4fS02mPQUUcBNwWQSZFXSzTSbsJFQvHt7DqyS3LK8oOWALFOsJ+8bbqBgkirZteD5Q==
+"@babel/plugin-transform-block-scoping@^7.0.0", "@babel/plugin-transform-block-scoping@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.3.4.tgz#5c22c339de234076eee96c8783b2fed61202c5c4"
+  integrity sha512-blRr2O8IOZLAOJklXLV4WhcEzpYafYQKSGT3+R26lWG41u/FODJuBggehtOwilVAcFu393v3OFj+HmaE6tVjhA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
 
-"@babel/plugin-transform-classes@^7.1.0", "@babel/plugin-transform-classes@^7.2.0":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.2.2.tgz#6c90542f210ee975aa2aa8c8b5af7fa73a126953"
-  integrity sha512-gEZvgTy1VtcDOaQty1l10T3jQmJKlNVxLDCs+3rCVPr6nMkODLELxViq5X9l+rfxbie3XrfrMCYYY6eX3aOcOQ==
+"@babel/plugin-transform-classes@^7.1.0", "@babel/plugin-transform-classes@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.3.4.tgz#dc173cb999c6c5297e0b5f2277fdaaec3739d0cc"
+  integrity sha512-J9fAvCFBkXEvBimgYxCjvaVDzL6thk0j0dBvCeZmIUDBwyt+nv6HfbImsSrWsYXfDNDivyANgJlFXDUWRTZBuA==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
     "@babel/helper-define-map" "^7.1.0"
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-optimise-call-expression" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.1.0"
+    "@babel/helper-replace-supers" "^7.3.4"
     "@babel/helper-split-export-declaration" "^7.0.0"
     globals "^11.1.0"
 
@@ -526,10 +536,10 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-simple-access" "^7.1.0"
 
-"@babel/plugin-transform-modules-systemjs@^7.0.0", "@babel/plugin-transform-modules-systemjs@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.2.0.tgz#912bfe9e5ff982924c81d0937c92d24994bb9068"
-  integrity sha512-aYJwpAhoK9a+1+O625WIjvMY11wkB/ok0WClVwmeo3mCjcNRjt+/8gHWrB5i+00mUju0gWsBkQnPpdvQ7PImmQ==
+"@babel/plugin-transform-modules-systemjs@^7.0.0", "@babel/plugin-transform-modules-systemjs@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.3.4.tgz#813b34cd9acb6ba70a84939f3680be0eb2e58861"
+  integrity sha512-VZ4+jlGOF36S7TjKs8g4ojp4MEI+ebCQZdswWb/T9I4X84j8OtFAyjXjt/M16iIm5RIZn0UMQgg/VgIwo/87vw==
   dependencies:
     "@babel/helper-hoist-variables" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -605,12 +615,12 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-jsx" "^7.2.0"
 
-"@babel/plugin-transform-regenerator@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0.tgz#5b41686b4ed40bef874d7ed6a84bdd849c13e0c1"
-  integrity sha512-sj2qzsEx8KDVv1QuJc/dEfilkg3RRPvPYx/VnKLtItVQRWt1Wqf5eVCOLZm29CiGFfYYsA3VPjfizTCV0S0Dlw==
+"@babel/plugin-transform-regenerator@^7.0.0", "@babel/plugin-transform-regenerator@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.3.4.tgz#1601655c362f5b38eead6a52631f5106b29fa46a"
+  integrity sha512-hvJg8EReQvXT6G9H2MvNPXkv9zK36Vxa1+csAVTpE1J3j0zlHplw76uudEbJxgvqZzAq9Yh45FLD4pk5mKRFQA==
   dependencies:
-    regenerator-transform "^0.13.3"
+    regenerator-transform "^0.13.4"
 
 "@babel/plugin-transform-runtime@7.1.0":
   version "7.1.0"
@@ -733,16 +743,16 @@
     js-levenshtein "^1.1.3"
     semver "^5.3.0"
 
-"@babel/preset-env@^7.3.1", "@babel/preset-env@~7.3.1":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.3.1.tgz#389e8ca6b17ae67aaf9a2111665030be923515db"
-  integrity sha512-FHKrD6Dxf30e8xgHQO0zJZpUPfVZg+Xwgz5/RdSWCbza9QLNk4Qbp40ctRoqDxml3O8RMzB1DU55SXeDG6PqHQ==
+"@babel/preset-env@^7.3.1", "@babel/preset-env@~7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.3.4.tgz#887cf38b6d23c82f19b5135298bdb160062e33e1"
+  integrity sha512-2mwqfYMK8weA0g0uBKOt4FE3iEodiHy9/CW0b+nWXcbL+pGzLx8ESYc+j9IIxr6LTDHWKgPm71i9smo02bw+gA==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-async-generator-functions" "^7.2.0"
     "@babel/plugin-proposal-json-strings" "^7.2.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.3.1"
+    "@babel/plugin-proposal-object-rest-spread" "^7.3.4"
     "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.2.0"
     "@babel/plugin-syntax-async-generators" "^7.2.0"
@@ -750,10 +760,10 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
     "@babel/plugin-transform-arrow-functions" "^7.2.0"
-    "@babel/plugin-transform-async-to-generator" "^7.2.0"
+    "@babel/plugin-transform-async-to-generator" "^7.3.4"
     "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
-    "@babel/plugin-transform-block-scoping" "^7.2.0"
-    "@babel/plugin-transform-classes" "^7.2.0"
+    "@babel/plugin-transform-block-scoping" "^7.3.4"
+    "@babel/plugin-transform-classes" "^7.3.4"
     "@babel/plugin-transform-computed-properties" "^7.2.0"
     "@babel/plugin-transform-destructuring" "^7.2.0"
     "@babel/plugin-transform-dotall-regex" "^7.2.0"
@@ -764,13 +774,13 @@
     "@babel/plugin-transform-literals" "^7.2.0"
     "@babel/plugin-transform-modules-amd" "^7.2.0"
     "@babel/plugin-transform-modules-commonjs" "^7.2.0"
-    "@babel/plugin-transform-modules-systemjs" "^7.2.0"
+    "@babel/plugin-transform-modules-systemjs" "^7.3.4"
     "@babel/plugin-transform-modules-umd" "^7.2.0"
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.3.0"
     "@babel/plugin-transform-new-target" "^7.0.0"
     "@babel/plugin-transform-object-super" "^7.2.0"
     "@babel/plugin-transform-parameters" "^7.2.0"
-    "@babel/plugin-transform-regenerator" "^7.0.0"
+    "@babel/plugin-transform-regenerator" "^7.3.4"
     "@babel/plugin-transform-shorthand-properties" "^7.2.0"
     "@babel/plugin-transform-spread" "^7.2.0"
     "@babel/plugin-transform-sticky-regex" "^7.2.0"
@@ -1892,18 +1902,18 @@ apollo-cache-control@0.5.1:
     apollo-server-env "2.2.0"
     graphql-extensions "0.5.2"
 
-apollo-cache-inmemory@^1.3.12, apollo-cache-inmemory@~1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.5.0.tgz#90b1a38f744762ab47c415b9d7b2d32fbd803088"
-  integrity sha512-hyg8R7G3XOfZhl8fQLs0vGEwi2rr8PuEIiumCY4qmwviaGsmwjs/Dm63cyeMm3Sfu05vzFQkwMdBf5u7xBg3cQ==
+apollo-cache-inmemory@^1.3.12, apollo-cache-inmemory@~1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.5.1.tgz#265d1ee67b0bf0aca9c37629d410bfae44e62953"
+  integrity sha512-D3bdpPmWfaKQkWy8lfwUg+K8OBITo3sx0BHLs1B/9vIdOIZ7JNCKq3EUcAgAfInomJUdN0QG1yOfi8M8hxkN1g==
   dependencies:
-    apollo-cache "^1.2.0"
-    apollo-utilities "^1.2.0"
+    apollo-cache "^1.2.1"
+    apollo-utilities "^1.2.1"
     optimism "^0.6.9"
     ts-invariant "^0.2.1"
     tslib "^1.9.3"
 
-apollo-cache@1.2.1, apollo-cache@^1.2.0:
+apollo-cache@1.2.1, apollo-cache@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.2.1.tgz#aae71eb4a11f1f7322adc343f84b1a39b0693644"
   integrity sha512-nzFmep/oKlbzUuDyz6fS6aYhRmfpcHWqNkkA9Bbxwk18RD6LXC4eZkuE0gXRX0IibVBHNjYVK+Szi0Yied4SpQ==
@@ -2105,7 +2115,7 @@ apollo-upload-client@^10.0.0:
     apollo-link-http-common "^0.2.8"
     extract-files "^5.0.0"
 
-apollo-utilities@1.2.1, apollo-utilities@^1.0.1, apollo-utilities@^1.0.27, apollo-utilities@^1.0.8, apollo-utilities@^1.1.3, apollo-utilities@^1.2.0, apollo-utilities@^1.2.1:
+apollo-utilities@1.2.1, apollo-utilities@^1.0.1, apollo-utilities@^1.0.27, apollo-utilities@^1.0.8, apollo-utilities@^1.1.3, apollo-utilities@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.2.1.tgz#1c3a1ebf5607d7c8efe7636daaf58e7463b41b3c"
   integrity sha512-Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg==
@@ -10261,10 +10271,10 @@ regenerator-runtime@^0.12.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
   integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
 
-regenerator-transform@^0.13.3:
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.3.tgz#264bd9ff38a8ce24b06e0636496b2c856b57bcbb"
-  integrity sha512-5ipTrZFSq5vU2YoGoww4uaRVAK4wyYC4TSICibbfEPOruUu8FFP7ErV0BjmbIOEpn3O/k9na9UEdYR/3m7N6uA==
+regenerator-transform@^0.13.4:
+  version "0.13.4"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.4.tgz#18f6763cf1382c69c36df76c6ce122cc694284fb"
+  integrity sha512-T0QMBjK3J0MtxjPmdIMXm72Wvj2Abb0Bd4HADdfijwMdoIsyQZ6fWC7kDFhk2YinBBEMZDL7Y7wh0J1sGx3S4A==
   dependencies:
     private "^0.1.6"