diff --git a/invite/gen.html b/invite/gen.html
index 1a281be..88af174 100644
--- a/invite/gen.html
+++ b/invite/gen.html
@@ -30,7 +30,7 @@
       }
       jsonObj = n;
       jsonStr = JSON.stringify(jsonObj);
-      out.innerText = base + "?" + window.btoa(jsonStr);
+      out.innerText = base + "?" + window.encodeURIComponent(window.btoa(jsonStr));
   }
 
 </script>
diff --git a/invite/index.html b/invite/index.html
index 316d05f..49c86d4 100644
--- a/invite/index.html
+++ b/invite/index.html
@@ -47,7 +47,11 @@
 </div>
 
 <script>
-var jsonStr = window.atob(window.location.search.slice(1));
+var rawStr = window.location.search.slice(1);
+if (rawStr.indexOf("%") !== -1) {
+    rawStr = window.decodeURIComponent(rawStr);
+}
+var jsonStr = window.atob(rawStr);
 var jsonObj = JSON.parse(jsonStr);
 var t1 = document.getElementById("t1");
 t1.innerText = "Tere "+jsonObj+"!";