diff --git a/src/vector/mobile_guide/index.html b/src/vector/mobile_guide/index.html
index 9b6f49cd3c..433d5b7e5a 100644
--- a/src/vector/mobile_guide/index.html
+++ b/src/vector/mobile_guide/index.html
@@ -341,7 +341,7 @@ body {
           </div>
         </div>
       </div>
-      <div class="mx_HomePage_col mx_HomePage_toprow">
+      <div id="step2_container" class="mx_HomePage_col mx_HomePage_toprow" style="display: none; ">
         <div class="mx_HomePage_row">
           <div>
               <h2>Step 2: Use a custom server</h2>
@@ -373,7 +373,7 @@ body {
       <div class="mx_HomePage_col mx_HomePage_toprow">
         <div class="mx_HomePage_row">
           <div>
-            <h2>Step 3: Register or Log in</h2>
+            <h2 id="step_login_header">Step 2: Register or Log in</h2>
             <p>Create a new account if you don&apos;t have one, or log in to your existing account.</p>
           </div>
         </div>
diff --git a/src/vector/mobile_guide/index.js b/src/vector/mobile_guide/index.js
index 8fa4f172cf..b2d007ac53 100644
--- a/src/vector/mobile_guide/index.js
+++ b/src/vector/mobile_guide/index.js
@@ -9,11 +9,15 @@ async function initPage() {
     document.getElementById('back_to_riot_button').onclick = onBackToRiotClick;
 
     const config = await getVectorConfig('..');
-    let hsUrl = 'https://matrix.org/';
+    let hsUrl;
     if (config && config['default_hs_url']) {
         hsUrl = config['default_hs_url'];
     }
-    document.getElementById('hs_url').innerHTML = hsUrl;
+    if (hsUrl && hsUrl !== 'https://matrix.org/') {
+        document.getElementById('step2_container').style.display = 'block';
+        document.getElementById('hs_url').innerHTML = hsUrl;
+        document.getElementById('step_login_header').innerHTML= 'Step 3: Register or Log in';
+    }
 }
 
 initPage();