diff --git a/pages/auth/signin.vue b/pages/auth/signin.vue
index 649ef54..2d54169 100755
--- a/pages/auth/signin.vue
+++ b/pages/auth/signin.vue
@@ -33,7 +33,7 @@ export default {
     ...mapActions('modules/user', [ 'login' ]),
     submit () {
       firebaseApp.auth().signInWithEmailAndPassword(this.email, this.password).then((firebaseUser) => {
-        return this.login(firebaseUser.uid)
+        return this.login(firebaseUser)
       }).then(() => {
         this.$router.push('/protected')
       }).catch((error) => {
diff --git a/pages/auth/signup.vue b/pages/auth/signup.vue
index c734809..14bc712 100755
--- a/pages/auth/signup.vue
+++ b/pages/auth/signup.vue
@@ -33,7 +33,7 @@ export default {
       try {
         const firebaseUser = await firebaseApp.auth().createUserWithEmailAndPassword(this.email, this.password)
         await this.writeUserData(firebaseUser.uid, firebaseUser.email)
-        await this.login(firebaseUser.uid)
+        await this.login(firebaseUser)
         this.$router.push('/protected')
       } catch (error) {
         console.log(error.message)
@@ -82,4 +82,3 @@ export default {
   }
 
 </style>
-
diff --git a/pages/protected/index.vue b/pages/protected/index.vue
index 30b7c7e..b63d7a2 100755
--- a/pages/protected/index.vue
+++ b/pages/protected/index.vue
@@ -7,7 +7,7 @@
       <div>
         User ID: {{ uid }}
       </div>
-      <h3>Current User: {{user.name}}</h3>
+      <h3>Current User: {{user.name||user.email}}</h3>
       <img v-if="user.avatar" :src="user.avatar" alt="">
       <div>
         All DB Users: {{ allusers }}