Merge branch 'develop' into feature/hash-routed

1 files changed, 6 insertions, 1 deletions

diff --git a/src/App.js b/src/App.js
index 14a41af0..06634adb 100644
--- a/src/App.js
+++ b/src/App.js
@@ -16,7 +16,12 @@ 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
+    },
+    logoStyle () { return { 'background-image': `url(${this.$store.state.config.logo})` } },
+    style () { return { 'background-image': `url(${this.background})` } },
+    sitename () { return this.$store.state.config.name }
   },
   methods: {
     activatePanel (panelName) {