diff --git a/daemon.py b/daemon.py
index 62f9f1bdc..265b5448d 100644
--- a/daemon.py
+++ b/daemon.py
@@ -5871,40 +5871,42 @@ class PubServer(BaseHTTPRequestHandler):
                         if check_name_and_bio:
                             redirect_path = 'previewAvatar'
 
+                    # change the theme from edit profile screen
                     if nickname == admin_nickname or \
                        is_artist(base_dir, nickname):
-                        # change theme
                         if fields.get('themeDropdown'):
-                            self.server.theme_name = fields['themeDropdown']
-                            set_theme(base_dir, self.server.theme_name, domain,
-                                      allow_local_network_access,
-                                      system_language,
-                                      self.server.dyslexic_font, True)
-                            self.server.text_mode_banner = \
-                                get_text_mode_banner(self.server.base_dir)
-                            self.server.iconsCache = {}
-                            self.server.fontsCache = {}
-                            self.server.css_cache = {}
-                            self.server.show_publish_as_icon = \
-                                get_config_param(self.server.base_dir,
-                                                 'showPublishAsIcon')
-                            self.server.full_width_tl_button_header = \
-                                get_config_param(self.server.base_dir,
-                                                 'fullWidthTlButtonHeader')
-                            self.server.icons_as_buttons = \
-                                get_config_param(self.server.base_dir,
-                                                 'iconsAsButtons')
-                            self.server.rss_icon_at_top = \
-                                get_config_param(self.server.base_dir,
-                                                 'rssIconAtTop')
-                            self.server.publish_button_at_top = \
-                                get_config_param(self.server.base_dir,
-                                                 'publishButtonAtTop')
-                            set_news_avatar(base_dir,
-                                            fields['themeDropdown'],
-                                            http_prefix,
-                                            domain,
-                                            domain_full)
+                            if self.server.theme_name != \
+                               fields['themeDropdown']:
+                                self.server.theme_name = \
+                                    fields['themeDropdown']
+                                set_theme(base_dir, self.server.theme_name,
+                                          domain, allow_local_network_access,
+                                          system_language,
+                                          self.server.dyslexic_font, True)
+                                self.server.text_mode_banner = \
+                                    get_text_mode_banner(self.server.base_dir)
+                                self.server.iconsCache = {}
+                                self.server.fontsCache = {}
+                                self.server.css_cache = {}
+                                self.server.show_publish_as_icon = \
+                                    get_config_param(self.server.base_dir,
+                                                     'showPublishAsIcon')
+                                self.server.full_width_tl_button_header = \
+                                    get_config_param(self.server.base_dir,
+                                                     'fullWidthTlButtonHeader')
+                                self.server.icons_as_buttons = \
+                                    get_config_param(self.server.base_dir,
+                                                     'iconsAsButtons')
+                                self.server.rss_icon_at_top = \
+                                    get_config_param(self.server.base_dir,
+                                                     'rssIconAtTop')
+                                self.server.publish_button_at_top = \
+                                    get_config_param(self.server.base_dir,
+                                                     'publishButtonAtTop')
+                                set_news_avatar(base_dir,
+                                                fields['themeDropdown'],
+                                                http_prefix,
+                                                domain, domain_full)
 
                     if nickname == admin_nickname:
                         # change media instance status
diff --git a/theme.py b/theme.py
index 21c0dbaba..955a6c986 100644
--- a/theme.py
+++ b/theme.py
@@ -542,6 +542,7 @@ def reset_theme_designer_settings(base_dir: str) -> None:
     if os.path.isfile(custom_variables_file):
         try:
             os.remove(custom_variables_file)
+            print('Theme designer settings were reset')
         except OSError:
             print('EX: unable to remove theme designer settings on reset')