diff --git a/jobs/discord/discord.go b/bots/discord/discord.go
similarity index 100%
rename from jobs/discord/discord.go
rename to bots/discord/discord.go
diff --git a/pages/dashboard/dashboard.go b/pages/dashboard/dashboard.go
index 61d06347..825473b8 100644
--- a/pages/dashboard/dashboard.go
+++ b/pages/dashboard/dashboard.go
@@ -40,7 +40,7 @@ func dashboard(ctx *aero.Context) string {
 	flow.Parallel(func() {
 		forumActivity, _ = arn.GetForumActivityCached()
 	}, func() {
-		animeList, err := arn.GetAnimeList(user)
+		animeList, err := arn.GetAnimeList(user.ID)
 
 		if err != nil {
 			return
diff --git a/pages/profile/stats.go b/pages/profile/stats.go
index 0a28bbef..722db07b 100644
--- a/pages/profile/stats.go
+++ b/pages/profile/stats.go
@@ -27,7 +27,7 @@ func GetStatsByUser(ctx *aero.Context) string {
 		return ctx.Error(http.StatusNotFound, "User not found", err)
 	}
 
-	animeList, err := arn.GetAnimeList(viewUser)
+	animeList, err := arn.GetAnimeList(viewUser.ID)
 	animeList.PrefetchAnime()
 
 	if err != nil {
diff --git a/pages/settings/settings.pixy b/pages/settings/settings.pixy
index bfd0e87c..7b982b2f 100644
--- a/pages/settings/settings.pixy
+++ b/pages/settings/settings.pixy
@@ -112,9 +112,10 @@ component Settings(user *arn.User)
 				Icon("picture-o")
 				span Avatar
 			
-			.widget-input
-				label(for="AvatarSource") Source:
-				select.widget-element.action(id="AvatarSource", data-field="AvatarSource", value="Gravatar", data-action="save", data-trigger="change")
+			.widget-input(data-api="/api/user/" + user.ID)
+				label(for="Avatar.Source") Source:
+				select.widget-element.action(id="Avatar.Source", data-field="Avatar.Source", value=user.Avatar.Source, data-action="save", data-trigger="change")
+					option(value="") Automatic
 					option(value="Gravatar") Gravatar
 				
 				if "Gravatar" == "Gravatar"