diff --git a/lib/templates/auth.class.js b/lib/templates/auth.class.js
index f898e7cd8..c0360382d 100644
--- a/lib/templates/auth.class.js
+++ b/lib/templates/auth.class.js
@@ -37,7 +37,7 @@ export default class Auth {
     this.syncToken()
 
     // Fetch user if is not available
-    return this.state.user ? Promise.resolve() : this.fetchUser()
+    return (!this.state.user && this.options.fetchUserOnLogin) ? this.fetchUser() : Promise.resolve()
   }
 
   _registerVuexStore () {