diff --git a/quasar.conf.js b/quasar.conf.js
index 35515ea4804e05b8251f82751f1aa85cd281ff19..605302675e2e8fdae7a2418b118c658e63ca1bb9 100644
--- a/quasar.conf.js
+++ b/quasar.conf.js
@@ -6,7 +6,7 @@ module.exports = function(ctx) {
   return {
     // app boot file (/src/boot)
     // --> boot files are part of "main.js"
-    boot: ["axios", "firebase"],
+    boot: ["axios", "firebase", "auth"],
 
     css: ["app.styl"],
 
diff --git a/src/boot/auth.js b/src/boot/auth.js
new file mode 100644
index 0000000000000000000000000000000000000000..4af3e10ced50e57c59a12726a98fa3cc9100b2dc
--- /dev/null
+++ b/src/boot/auth.js
@@ -0,0 +1,15 @@
+// import something here
+import firebase from "firebase/app";
+import "firebase/auth";
+// "async" is optional
+export default async ({ router, store /* app, router, Vue, ... */ }) => {
+  // something to do
+
+  firebase.auth().onAuthStateChanged(user => {
+    store.dispatch("auth/signInFromSession", user);
+  });
+
+  router.beforeEach((to, from, next) => {
+    return next();
+  });
+};
diff --git a/src/store/auth/actions.js b/src/store/auth/actions.js
index d593d73364d90ea7b0a2c9f80fdf3e61bead8838..95f87d6e554d7a4375dd1286ddcdde995b35d5ed 100644
--- a/src/store/auth/actions.js
+++ b/src/store/auth/actions.js
@@ -79,8 +79,27 @@ export function signInWithGoogle({ commit }) {
   });
 }
 
+export function signInFromSession({ commit, dispatch }, user) {
+  if (!user) {
+    return dispatch("signOut");
+  }
+
+  commit("setStatus", "loading");
+  return new Promise((resolve, reject) => {
+    commit("setUser", {
+      name: user.displayName,
+      email: user.email,
+      photoURL: user.photoURL,
+      uid: user.uid
+    });
+    commit("setStatus", "success");
+    commit("setError", null);
+    resolve(user);
+  });
+}
+
 export function signOut({ commit }) {
-  firebase
+  return firebase
     .auth()
     .signOut()
     .then(function() {