2 files changed, 6 insertions, 2 deletions
diff --git a/src/App.js b/src/App.js
index c326ddfc..736755ea 100644
--- a/src/App.js
+++ b/src/App.js
@@ -16,7 +16,10 @@ export default {
   }),
   computed: {
     currentUser () { return this.$store.state.users.currentUser },
-    style () { return { 'background-image': `url(${this.currentUser.background_image})` } },
+    background () {
+      return this.currentUser.background_image || this.$store.state.config.background
+    },
+    style () { return { 'background-image': `url(${this.background})` } },
     sitename () { return this.$store.state.config.name }
   },
   methods: {
diff --git a/src/main.js b/src/main.js
index 20489d42..68653c37 100644
--- a/src/main.js
+++ b/src/main.js
@@ -71,7 +71,8 @@ new Vue({
 
 window.fetch('/static/config.json')
   .then((res) => res.json())
-  .then(({name, theme}) => {
+  .then(({name, theme, background}) => {
     store.dispatch('setOption', { name: 'name', value: name })
     store.dispatch('setOption', { name: 'theme', value: theme })
+    store.dispatch('setOption', { name: 'background', value: background })
   })