diff --git a/index.html b/index.html
index 8180d375..4376907e 100644
--- a/index.html
+++ b/index.html
@@ -117,9 +117,13 @@
     }
 
     // Construct a user discovery tag
-    function to_tag(tagname, value) {
-      if (tagname && value) {
-          return [tagname + ":" + value];
+    function to_tags(tagsObj) {
+      if(tagsObj && Object.keys(tagsObj).length > 0) {
+        var tags = [];
+        for(var key in tagsObj) {
+          tags.push(key + ":" + tagsObj[key]);
+        }
+        return tags;
       }
       return undefined;
     }
@@ -693,7 +697,7 @@
             this.state.password.trim(),
             vcard(this.state.fn, this.state.imageDataUrl),
             null,
-            to_tag("email", this.state.email));
+            to_tags({"email": this.state.email}));
         }
       },
       render: function() {