diff --git a/mobile/chrome/content/browser.xul b/mobile/chrome/content/browser.xul
index e7da5d9da3e4..e14ad1553ec1 100644
--- a/mobile/chrome/content/browser.xul
+++ b/mobile/chrome/content/browser.xul
@@ -533,9 +533,9 @@
           <description class="syncsetup-center" flex="1">&sync.setup.jpake;</description>
           <separator/>
           <vbox align="center" flex="1">
-            <description id="syncsetup-code1" class="syncsetup-code"></description>
-            <description id="syncsetup-code2" class="syncsetup-code"></description>
-            <description id="syncsetup-code3" class="syncsetup-code"></description>
+            <description id="syncsetup-code1" class="syncsetup-code">....</description>
+            <description id="syncsetup-code2" class="syncsetup-code">....</description>
+            <description id="syncsetup-code3" class="syncsetup-code">....</description>
           </vbox>
           <separator/>
           <description class="syncsetup-center syncsetup-link" flex="1" onclick="WeaveGlue.openManual();">&sync.fallback;</description>
diff --git a/mobile/chrome/content/sync.js b/mobile/chrome/content/sync.js
index 643ed9dd1e74..4f5f0c5ffeb1 100644
--- a/mobile/chrome/content/sync.js
+++ b/mobile/chrome/content/sync.js
@@ -69,9 +69,9 @@ let WeaveGlue = {
   },
 
   abortEasySetup: function abortEasySetup() {
-    document.getElementById("syncsetup-code1").value = "";
-    document.getElementById("syncsetup-code2").value = "";
-    document.getElementById("syncsetup-code3").value = "";
+    document.getElementById("syncsetup-code1").value = "....";
+    document.getElementById("syncsetup-code2").value = "....";
+    document.getElementById("syncsetup-code3").value = "....";
     if (!this.jpake)
       return;
 
@@ -80,6 +80,9 @@ let WeaveGlue = {
   },
 
   open: function open() {
+    // Clear up any previous JPAKE codes
+    this.abortEasySetup();
+    
     // Show the connect UI
     document.getElementById("syncsetup-container").hidden = false;
     document.getElementById("syncsetup-jpake").hidden = false;