diff --git a/app/controllers/saved_searches_controller.rb b/app/controllers/saved_searches_controller.rb
index 1a0dfe2e1..b89d5836c 100644
--- a/app/controllers/saved_searches_controller.rb
+++ b/app/controllers/saved_searches_controller.rb
@@ -3,10 +3,6 @@ class SavedSearchesController < ApplicationController
   respond_to :html, :xml, :json, :js
   
   def index
-    if Danbooru.config.listbooru_server && CurrentUser.is_gold?
-      SavedSearch.refresh_listbooru(CurrentUser.id)
-    end
-
     @saved_searches = saved_searches.order("tag_query")
     @categories = @saved_searches.group_by{|saved_search| saved_search.category.to_s}
     @categories = @categories.sort_by{|category, saved_searches| category.to_s}
diff --git a/app/logical/session_loader.rb b/app/logical/session_loader.rb
index b479644f8..bc6d94bd5 100644
--- a/app/logical/session_loader.rb
+++ b/app/logical/session_loader.rb
@@ -105,6 +105,13 @@ private
     return if CurrentUser.is_anonymous?
     return if CurrentUser.last_logged_in_at && CurrentUser.last_logged_in_at > 1.week.ago
     CurrentUser.user.update_attribute(:last_logged_in_at, Time.now)
+    refresh_listbooru
+  end
+
+  def refresh_listbooru
+    if CurrentUser.is_gold? && CurrentUser.has_saved_searches? && Danbooru.config.listbooru_server && CurrentUser.is_gold?
+      SavedSearch.refresh_listbooru(CurrentUser.id)
+    end
   end
 
   def set_time_zone