diff --git a/app/graphql/index.js b/app/graphql/index.js
index c8315218251878156a9f328908e971bf67324b23..b980b81b6a6225ecbaa97d7ccc6576e7243d1afa 100644
--- a/app/graphql/index.js
+++ b/app/graphql/index.js
@@ -1,3 +1,5 @@
+// TODO: Combine this with app/queries/index
+
 import gql from 'graphql-tag'
 
 export default {
@@ -7,6 +9,11 @@ export default {
         id
         username
         admin
+        profilePicture
+        defaultIdentity {
+          aff
+          name
+        }
       }
     }
   `,
diff --git a/app/queries/index.js b/app/queries/index.js
index 33aaf2f5a11989807c2a6aad0105054f657519d3..8aaf5dbb875500c0bcb0f6b06f7587f81ade91f2 100644
--- a/app/queries/index.js
+++ b/app/queries/index.js
@@ -8,9 +8,7 @@ export const GET_CURRENT_USER = gql`
       username
       defaultIdentity {
         aff
-        name {
-          surname
-        }
+        name
         type
         ... on ExternalIdentity {
           identifier