diff --git a/frontend/src/components/HeaderIntern.vue b/frontend/src/components/HeaderIntern.vue
index 5496783..19bde11 100644
--- a/frontend/src/components/HeaderIntern.vue
+++ b/frontend/src/components/HeaderIntern.vue
@@ -1,5 +1,9 @@
 <template>
-  <Header>
+  <Header v-if="user">
+    <v-btn flat :to="{ name: 'deckcp' }">
+      <v-icon>view_carousel</v-icon> Decks
+    </v-btn>
+
     <v-btn flat :to="{ name: 'usercp' }">
       <v-icon>person</v-icon> {{ user.login }}
     </v-btn>
@@ -25,10 +29,7 @@
             Cancel
           </v-btn>
 
-          <v-btn
-            color="success"
-            @click.native="logout"
-          >
+          <v-btn color="success" @click.native="logout">
             Confirm
           </v-btn>
         </v-card-actions>
@@ -85,19 +86,21 @@ export default {
   asyncComputed: {
     user: {
       get() {
-      return axios
-        .post('/user/info', {
-          session: this.session
-        })
-        .then(response => {
-          if (response.data.success) {
-            this.$emit('input', this.session)
-            return response.data.user
-          } else {
-            this.goHome()
-            return null
-          }
-        })},
+        return axios
+          .post('/user/info', {
+            session: this.session
+          })
+          .then(response => {
+            if (response.data.success) {
+              this.$emit('input', this.session)
+              this.$emit('user', response.data.user)
+              return response.data.user
+            } else {
+              this.goHome()
+              return null
+            }
+          })
+      },
       default: {
         user: 0,
         login: '',
diff --git a/frontend/src/components/UserInfo.vue b/frontend/src/components/UserInfo.vue
new file mode 100644
index 0000000..3c767a0
--- /dev/null
+++ b/frontend/src/components/UserInfo.vue
@@ -0,0 +1,16 @@
+<template>
+  <div>
+    {{ user.login }}
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'UserInfo',
+
+  props: {
+    session: String,
+    user: Object
+  }
+}
+</script>
diff --git a/frontend/src/components/forms/Login.vue b/frontend/src/components/forms/Login.vue
index 3560d23..51c202b 100644
--- a/frontend/src/components/forms/Login.vue
+++ b/frontend/src/components/forms/Login.vue
@@ -64,7 +64,7 @@ export default {
             let cookie_data = JSON.parse(response.data.message)
             Cookies.set('session', cookie_data.value, cookie_data.properties)
             this.$refs.main.showSnackbar('Login successful!', 'success')
-            this.$router.push('usercp')
+            this.$router.push('deckcp')
           } else {
             this.$refs.main.showSnackbar(response.data.message, 'error')
           }
diff --git a/frontend/src/router.js b/frontend/src/router.js
index bdf73cd..a684503 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -22,6 +22,12 @@ export default new Router({
       component: () =>
         import(/* webpackChunkName: "usercp" */ './views/UserCP.vue')
     },
+    {
+      path: '/deckcp',
+      name: 'deckcp',
+      component: () =>
+        import(/* webpackChunkName: "deckcp" */ './views/DeckCP.vue')
+    },
     {
       path: '/game',
       name: 'game',
diff --git a/frontend/src/views/DeckCP.vue b/frontend/src/views/DeckCP.vue
new file mode 100644
index 0000000..aecdaac
--- /dev/null
+++ b/frontend/src/views/DeckCP.vue
@@ -0,0 +1,29 @@
+<template>
+  <v-content>
+    <HeaderIntern v-model="session" @user="user = $event" />
+
+    <v-container v-if="user">
+      <h2 class="headline">Your Decks</h2>
+      <DeckList :session="session" />
+    </v-container>
+  </v-content>
+</template>
+
+<script>
+import HeaderIntern from '@/components/HeaderIntern.vue'
+import DeckList from '@/components/DeckList.vue'
+
+export default {
+  name: 'DeckCP',
+
+  components: {
+    HeaderIntern,
+    DeckList
+  },
+
+  data: () => ({
+    session: null,
+    user: null
+  })
+}
+</script>
diff --git a/frontend/src/views/Home.vue b/frontend/src/views/Home.vue
index aa53adf..2b177d4 100644
--- a/frontend/src/views/Home.vue
+++ b/frontend/src/views/Home.vue
@@ -36,15 +36,17 @@ export default {
 
   mounted() {
     this.$nextTick(() => {
-      axios
-        .post('/user/login', {
-          session: this.session
-        })
-        .then(response => {
-          if (response.data.success) {
-            this.$router.push({ name: 'usercp' })
-          }
-        })
+      if (this.session) {
+        axios
+          .post('/user/login', {
+            session: this.session
+          })
+          .then(response => {
+            if (response.data.success) {
+              this.$router.push({ name: 'deckcp' })
+            }
+          })
+      }
     })
   }
 }
diff --git a/frontend/src/views/UserCP.vue b/frontend/src/views/UserCP.vue
index 7ba303a..46f19a0 100644
--- a/frontend/src/views/UserCP.vue
+++ b/frontend/src/views/UserCP.vue
@@ -1,27 +1,29 @@
 <template>
   <v-content>
-    <v-container>
-      <HeaderIntern v-model="session" />
+    <HeaderIntern v-model="session" @user="user = $event" />
 
-      <DeckList :session="session" />
+    <v-container v-if="user">
+      <h2 class="headline">User Info</h2>
+      <UserInfo :session="session" :user="user" />
     </v-container>
   </v-content>
 </template>
 
 <script>
 import HeaderIntern from '@/components/HeaderIntern.vue'
-import DeckList from '@/components/DeckList.vue'
+import UserInfo from '@/components/UserInfo.vue'
 
 export default {
   name: 'UserCP',
 
   components: {
     HeaderIntern,
-    DeckList
+    UserInfo
   },
 
   data: () => ({
-    session: ''
+    session: null,
+    user: null
   })
 }
 </script>