diff --git a/src/vector/mobile_guide/index.html b/src/vector/mobile_guide/index.html
index 4a0a379e0f6..e1d54744bb9 100644
--- a/src/vector/mobile_guide/index.html
+++ b/src/vector/mobile_guide/index.html
@@ -32,6 +32,7 @@
     cursor: pointer;
     padding: 12px 22px;
     word-break: break-word;
+    text-decoration: none;
 }
 
 .mx_Center {
@@ -360,7 +361,7 @@ <h2>1: Install the app</h2>
         <div class="mx_HomePage_row">
           <div>
               <h2>2: Configure your app</h2>
-              <button class="mx_Button" id="configure_riot_button" href="#">Configure</button>
+              <a class="mx_Button" id="configure_riot_button" href="#">Configure</a>
               <p class="mx_Subtext">Tap the button above, or manually enable <em>Use custom server</em> and enter:</p>
               <p class="mx_Subtext">Homeserver: <em id="hs_url"></em></p>
               <p class="mx_Subtext" id="default_is">Identity Server: <em>https://vector.im</em> (default)</p>
diff --git a/src/vector/mobile_guide/index.js b/src/vector/mobile_guide/index.js
index e78992b7de3..28e7470490d 100644
--- a/src/vector/mobile_guide/index.js
+++ b/src/vector/mobile_guide/index.js
@@ -92,6 +92,9 @@ async function initPage() {
     if (isUrl && !isUrl.endsWith('/')) isUrl += '/';
 
     if (hsUrl !== 'https://matrix.org/') {
+        document.getElementById('configure_riot_button').href =
+            "https://riot.im/config/config?hs_url=" + encodeURIComponent(hsUrl)  +
+            "&is_url=" + encodeURIComponent(isUrl);
         document.getElementById('step2_container').style.display = 'block';
         document.getElementById('hs_url').innerText = hsUrl;
         document.getElementById('step_login_header').innerHTML= '3: Launch the app';