diff --git a/public/js/account.js b/public/js/account.js
index d9db0c777..8dac187e3 100644
--- a/public/js/account.js
+++ b/public/js/account.js
@@ -278,6 +278,7 @@ firebase.auth().onAuthStateChanged(function (user) {
       if ($(".pageLogin").hasClass("active")) {
         changePage("account");
       }
+      refreshThemeButtons();
       accountIconLoading(false);
       updateFilterTags();
       updateCommandsTagsList();
diff --git a/public/js/userconfig.js b/public/js/userconfig.js
index fed6d339b..133a47662 100644
--- a/public/js/userconfig.js
+++ b/public/js/userconfig.js
@@ -234,8 +234,10 @@ function setDifficulty(diff, nosave) {
 //set fav themes
 function setFavThemes(themes, nosave) {
   config.favThemes = themes;
-  refreshThemeButtons();
-  if (!nosave) saveConfigToCookie();
+  if (!nosave) {
+    refreshThemeButtons();
+    saveConfigToCookie();
+  }
 }
 
 //blind mode