diff --git a/app/http/endpoints/root/callback.go b/app/http/endpoints/root/callback.go
index a2c375b..986f494 100644
--- a/app/http/endpoints/root/callback.go
+++ b/app/http/endpoints/root/callback.go
@@ -43,7 +43,7 @@ func CallbackHandler(ctx *gin.Context) {
 	}
 	defer store.Save()
 
-	if utils.IsLoggedIn(store) {
+	if utils.IsLoggedIn(store) && store.Get("has_guilds") == true {
 		ctx.Redirect(302, config.Conf.Server.BaseUrl)
 		return
 	}
@@ -76,9 +76,7 @@ func CallbackHandler(ctx *gin.Context) {
 	store.Set("userid", currentUser.Id)
 	store.Set("name", currentUser.Username)
 	store.Set("avatar", currentUser.AvatarUrl(256))
-	if err = store.Save(); err != nil {
-		log.Error(err.Error())
-	}
+	store.Save()
 
 	var guilds []guild.Guild
 	err, _ = userEndpoint.CurrentUserGuilds.Request(store, nil, nil, &guilds)
@@ -88,6 +86,7 @@ func CallbackHandler(ctx *gin.Context) {
 	}
 
 	store.Set("has_guilds", true)
+	store.Save()
 
 	var wrappedGuilds []database.UserGuild
 
diff --git a/app/http/endpoints/root/logout.go b/app/http/endpoints/root/logout.go
index 437463a..50d46f9 100644
--- a/app/http/endpoints/root/logout.go
+++ b/app/http/endpoints/root/logout.go
@@ -1,17 +1,18 @@
-package root
-
-import (
-	"github.com/gin-gonic/contrib/sessions"
-	"github.com/gin-gonic/gin"
-)
-
-func LogoutHandler(ctx *gin.Context) {
-	store := sessions.Default(ctx)
-	if store == nil {
-		return
-	}
-	defer store.Save()
-
-	store.Clear()
-	ctx.Redirect(302, "https://ticketsbot.net")
-}
+package root
+
+import (
+	"github.com/gin-gonic/contrib/sessions"
+	"github.com/gin-gonic/gin"
+)
+
+func LogoutHandler(ctx *gin.Context) {
+	store := sessions.Default(ctx)
+	if store == nil {
+		return
+	}
+	defer store.Save()
+
+	store.Clear()
+
+	ctx.Redirect(302, "https://ticketsbot.net")
+}