diff --git a/src/App.js b/src/App.js
index 3e0d0d6f..898cda59 100644
--- a/src/App.js
+++ b/src/App.js
@@ -76,7 +76,7 @@ export default {
? null
: this.$store.state.instance.background
},
- background () { return this.pageBackground || this.userBackground || this.instanceBackground },
+ background () { return this.pageBackground || (this.$store.getters.mergedConfig.overrideInstanceWallpaper && this.userBackground) || this.instanceBackground },
bgStyle () {
if (this.background) {
return {
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index b08b1210..2cfb46e3 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -224,6 +224,11 @@
/>
+
{{ $t('settings.set_new_profile_background') }}