diff --git a/mod/admin.php b/mod/admin.php
index 7749cff6dc..3090376bea 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -1120,6 +1120,7 @@ function admin_page_site_post(App $a)
 	}
 	Config::set('system', 'language', $language);
 	Config::set('system', 'theme', $theme);
+	Theme::install($theme);
 
 	if ($theme_mobile == '---') {
 		Config::delete('system', 'mobile-theme');
diff --git a/mod/settings.php b/mod/settings.php
index aec2b2a050..3102fef233 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -12,6 +12,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Core\Theme;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
@@ -354,6 +355,7 @@ function settings_post(App $a)
 				theme_post($a);
 			}
 		}
+		Theme::install($theme);
 
 		$r = q("UPDATE `user` SET `theme` = '%s' WHERE `uid` = %d",
 				dbesc($theme),