diff --git a/app/components/global/AppBar.js b/app/components/global/AppBar.js
index 9d0a0ce894e42d7cd120eca9dac86c2ff009fcf4..581ca9bad40dae60b09cb9e542e3725c50f5ac2c 100644
--- a/app/components/global/AppBar.js
+++ b/app/components/global/AppBar.js
@@ -13,7 +13,7 @@ const ElifeAppBar = ({ history, currentUser }) => (
       window.localStorage.removeItem('token')
       history.push('/')
     }}
-    user={currentUser.user}
+    user={currentUser}
   />
 )
 
diff --git a/app/components/global/AuthenticatedComponent.js b/app/components/global/AuthenticatedComponent.js
index 56ba709cd6b51c99ee0a0dcd7ef118e8d16ad8e3..d8383ed2b7cf86b2b41d2558b3d15d2dfc2866ae 100644
--- a/app/components/global/AuthenticatedComponent.js
+++ b/app/components/global/AuthenticatedComponent.js
@@ -14,7 +14,7 @@ const AuthenticatedComponent = ({ children }) => (
 
       if (error) return <div>{error.message}</div>
 
-      if (data.currentUser && !data.currentUser.user) {
+      if (!data.currentUser) {
         return <Redirect to="/login" />
       }
 
diff --git a/app/components/global/queries.js b/app/components/global/queries.js
index 6dc3489b0ecb58946e6d6c9923cb372f19eb3be9..d5a26adbef6ed3daa782713e81e6ace94eb02836 100644
--- a/app/components/global/queries.js
+++ b/app/components/global/queries.js
@@ -3,11 +3,9 @@ import gql from 'graphql-tag'
 export const CURRENT_USER = gql`
   query CurrentUser {
     currentUser {
-      user {
-        id
-        username
-        admin
-      }
+      id
+      username
+      admin
     }
   }
 `
diff --git a/package.json b/package.json
index 9f82a5ebe7189b9ef764cc6adb26f0989ff619b5..152459b8af9412ce7c65d1dddd4ca5a001349dbe 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
     "lodash": "^4.17.5",
     "prop-types": "^15.5.10",
     "pubsweet-client": "^2.4.0",
-    "pubsweet-server": "^5.0.0",
+    "pubsweet-server": "^6.0.0",
     "react": "^16.2.0",
     "react-apollo": "^2.1.2",
     "react-dom": "^16.2.0",
diff --git a/yarn.lock b/yarn.lock
index f4cba40bf51ff545ea81f9d25c8999780ddd35a0..eb3c3825c08eef8e108b5522e9f95bed5c58bb8d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8230,9 +8230,9 @@ pubsweet-server@^4.0.0:
     uuid "^3.0.1"
     winston "^2.2.0"
 
-pubsweet-server@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/pubsweet-server/-/pubsweet-server-5.0.0.tgz#7b7f363834ac67ab0648b3cdcfc1a814fb15a15a"
+pubsweet-server@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/pubsweet-server/-/pubsweet-server-6.0.0.tgz#d91702dac91cfc98325d9cb6441a7c1acbdb788d"
   dependencies:
     "@pubsweet/logger" "^0.2.2"
     apollo-server-express "^1.3.2"
@@ -8263,7 +8263,7 @@ pubsweet-server@^5.0.0:
     pg "^7.4.1"
     promise-queue "^2.2.3"
     prompt "^1.0.0"
-    pubsweet-sse "^0.1.5"
+    pubsweet-sse "^1.0.0"
     require-relative "^0.8.7"
     uuid "^3.0.1"
     winston "^2.2.0"
@@ -8272,9 +8272,9 @@ pubsweet-sse@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/pubsweet-sse/-/pubsweet-sse-0.1.4.tgz#1ff38a230143cbd487a8d44afb28a6c4746ee464"
 
-pubsweet-sse@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/pubsweet-sse/-/pubsweet-sse-0.1.5.tgz#c93195c52121e299c8a55896962d870f792ce963"
+pubsweet-sse@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/pubsweet-sse/-/pubsweet-sse-1.0.0.tgz#dd36aa378a302b518d417b545b064da65aec876a"
 
 pubsweet@^2.1.4:
   version "2.1.7"