diff --git a/roles/matrix-riot-web/defaults/main.yml b/roles/matrix-riot-web/defaults/main.yml
index 4fe8703a8..828532f50 100644
--- a/roles/matrix-riot-web/defaults/main.yml
+++ b/roles/matrix-riot-web/defaults/main.yml
@@ -32,16 +32,6 @@ matrix_riot_web_welcome_user_id: "@riot-bot:matrix.org"
 # Branding of riot web
 matrix_riot_web_brand: "Riot"
 
-# Links, shown in footer of welcome page:
-# [{"text": "Link text", "url": "https://link.target"}, {"text": "Other link"}]
-matrix_riot_web_welcome_footerlinks: false
-
-# URL to image, shown during Login
-matrix_riot_web_welcome_authlogo: false
-
-# URL to Wallpaper, shown in background of welcome page
-matrix_riot_web_welcome_background: false
-
 # URL to Logo on welcome page
 matrix_riot_web_welcome_logo: "welcome/images/logo.svg"
 
@@ -51,6 +41,16 @@ matrix_riot_web_welcome_logo_link: "https://riot.im"
 matrix_riot_web_welcome_headline: "_t('Welcome to Riot.im')"
 matrix_riot_web_welcome_text: "_t('Decentralised, encrypted chat & collaboration powered by [matrix]')"
 
+# Links, shown in footer of welcome page:
+# [{"text": "Link text", "url": "https://link.target"}, {"text": "Other link"}]
+matrix_riot_web_welcome_footerlinks: false
+
+# URL to image, shown during Login
+matrix_riot_web_welcome_authlogo: "{{ matrix_riot_web_welcome_logo }}"
+
+# URL to Wallpaper, shown in background of welcome page
+matrix_riot_web_welcome_background: false
+
 # By default, there's no Riot homepage (when logged in). If you wish to have one,
 # point this to a `home.html` template file on your local filesystem.
 matrix_riot_web_embedded_pages_home_path: ~