diff --git a/resources/static/pages/add_email_address.js b/resources/static/pages/add_email_address.js
index 0faff6d6cb66ffae21e5d0429bf20aae7d9aff86..010fed083044eb0f8d2d98da100924982b547e2e 100644
--- a/resources/static/pages/add_email_address.js
+++ b/resources/static/pages/add_email_address.js
@@ -37,13 +37,15 @@
 (function() {
   "use strict";
   
-  var ANIMATION_TIME=250;
+  var ANIMATION_TIME=250,
+      dom = BrowserID.DOM;
+
   function emailRegistrationSuccess(info) {
 
-    $("#email").text(info.email);
+    dom.setInner("#email", info.email);
     
     if (info.origin) {
-      $(".website").html(info.origin);
+      dom.setInner(".website", info.origin);
       $(".siteinfo").show();
     }
 
diff --git a/resources/static/test/qunit/pages/add_email_address_test.js b/resources/static/test/qunit/pages/add_email_address_test.js
index 3fd4916f63578ef693ca08f3d590ba5e3a2540be..31797401683516ebfd4328f3b4f04d53df341cfc 100644
--- a/resources/static/test/qunit/pages/add_email_address_test.js
+++ b/resources/static/test/qunit/pages/add_email_address_test.js
@@ -50,6 +50,7 @@
       $(".error").removeClass("error");
       $("#error").stop().hide();
       $(".website").text("");
+      $(".siteinfo").hide();
     },
     teardown: function() {
       network.setXHR($);
@@ -65,7 +66,7 @@
     bid.addEmailAddress("token");
 
     setTimeout(function() {
-      equal($("#email").text(), "testuser@testuser.com", "email set");
+      equal($("#email").val(), "testuser@testuser.com", "email set");
       ok($(".siteinfo").is(":visible"), "siteinfo is visible when we say what it is");
       equal($(".website").text(), "browserid.org", "origin is updated");
       start();
@@ -76,7 +77,7 @@
     bid.addEmailAddress("token");
 
     setTimeout(function() {
-      equal($("#email").text(), "testuser@testuser.com", "email set");
+      equal($("#email").val(), "testuser@testuser.com", "email set");
       equal($(".siteinfo").is(":visible"), false, "siteinfo is not visible without having it");
       equal($(".siteinfo .website").text(), "", "origin is not updated");
       start();