diff --git a/res/welcome.html b/res/welcome.html
index ba5d8d69..ba368b31 100644
--- a/res/welcome.html
+++ b/res/welcome.html
@@ -166,6 +166,11 @@ h1::after {
                 <div class="mx_ButtonLabel">_t("Create Account")</div>
             </a>
         </div>
+        <!-- The comments below are meant to be used by Ansible as a quick way
+             to strip out the marked content when desired.
+             See https://github.com/vector-im/riot-web/issues/8622.
+             TODO: Convert to config option if possible. -->
+        <!-- BEGIN Ansible: Remove these lines when guest access is disabled -->
         <div class="mx_ButtonRow">
             <div>
                 <div class="mx_ButtonWrapperText">_t("Need help?")</div>
@@ -180,5 +185,6 @@ h1::after {
                 </a>
             </div>
         </div>
+        <!-- END Ansible: Remove these lines when guest access is disabled -->
     </div>
 </div>
diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js
index aa7fe58f..7840d776 100644
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -149,6 +149,9 @@ describe('loading:', function() {
         const config = Object.assign({
             default_hs_url: DEFAULT_HS_URL,
             default_is_url: DEFAULT_IS_URL,
+            embeddedPages: {
+                homeUrl: 'data:text/html;charset=utf-8;base64,PGh0bWw+PC9odG1sPg==',
+            },
         }, opts.config || {});
 
         PlatformPeg.set(new WebPlatform());