diff --git a/mozilla/zap/client/content/identity.xul b/mozilla/zap/client/content/identity.xul
index e458b30c684..762a2fc12d1 100644
--- a/mozilla/zap/client/content/identity.xul
+++ b/mozilla/zap/client/content/identity.xul
@@ -59,6 +59,7 @@
       initIdentityForm();
       wIdentity = parent.getIdentity(parent.getSelectedSidebarResource().Value);
       wIdentity.fillDocument(document);
+      wIdentity.initXULTemplate(document.getElementById("identity-template-1"), true);
     }    
 
     function del() {
@@ -95,6 +96,14 @@
       wIdentity.fillDocument(document);
     }
 
+    function registerNow() {
+      parent.registerIdentity(wIdentity);
+    }
+
+    function unregisterNow() {
+      parent.unregisterIdentity(wIdentity);
+    }
+
   ]]>
   </script>
 
@@ -104,6 +113,73 @@
       <spacer flex="1"/>
       <button label="Delete this identity" oncommand="del()"/>
     </box>
+
+    <vbox id="identity-template-1"
+          containment="urn:mozilla:zap:current-identity"
+          datasources="rdf:null"
+          flags="dont-buid-content"
+          ref="urn:mozilla:zap:root">
+      <template>
+        <rule><!-- NON-REGISTERED IDENTITY -->
+          <conditions>
+            <content uri="?dummy"/>
+            <member container="?dummy" child="?node"/>
+            <triple subject="?node"
+                    predicate="urn:mozilla:zap:registration_status"
+                    object=""/>                
+          </conditions>
+          <action>
+            <groupbox flex="1" uri="?node">
+              <caption><label value="Status"/></caption>
+              <hbox flex="1">
+                <label value="Not registered"/>
+                <spacer flex="1"/>
+                <button label="Register now" oncommand="registerNow()"/>
+              </hbox>
+            </groupbox>
+          </action>
+        </rule>
+        <rule><!-- REGISTERED IDENTITY -->
+          <conditions>
+            <content uri="?dummy"/>
+            <member container="?dummy" child="?node"/>
+            <triple subject="?node"
+                    predicate="urn:mozilla:zap:registration_status"
+                    object="registered"/>                
+          </conditions>
+          <action>
+            <groupbox flex="1" uri="?node">
+              <caption><label value="Status"/></caption>
+              <hbox flex="1">
+                <label value="Registered"/>
+                <spacer flex="1"/>
+                <button label="Unregister now" oncommand="unregisterNow()"/>
+              </hbox>
+            </groupbox>
+          </action>
+        </rule>
+        <rule><!-- REGISTERING IDENTITY -->
+          <conditions>
+            <content uri="?dummy"/>
+            <member container="?dummy" child="?node"/>
+            <triple subject="?node"
+                    predicate="urn:mozilla:zap:registration_status"
+                    object="registering"/>   
+          </conditions>
+          <action>
+            <groupbox flex="1" uri="?node">
+              <caption><label value="Status"/></caption>
+              <hbox flex="1">
+                <label value="Registering..."/>
+                <spacer flex="1"/>
+                <button label="Stop registering" oncommand="unregisterNow()"/>
+              </hbox>
+            </groupbox>
+          </action>
+        </rule>
+      </template>
+    </vbox>
+    
     <vbox id="zap_identity_form"/>
   </vbox>
   <hbox style="display:none" class="zap-form-buttonbar">
diff --git a/mozilla/zap/client/content/zap.js b/mozilla/zap/client/content/zap.js
index e8b04c41822..308e391ed79 100644
--- a/mozilla/zap/client/content/zap.js
+++ b/mozilla/zap/client/content/zap.js
@@ -524,6 +524,7 @@ Identity.addInterfaces(Components.interfaces.zapISipCredentialsProvider);
 
 Identity.prototype.datasources["default"] = wIdentitiesDS;
 Identity.prototype.datasources["global-ephemeral"] = wGlobalEphemeralDS;
+Identity.addInMemoryDS("ephemeral");
 
 Identity.rdfResourceAttrib("urn:mozilla:zap:sidebarparent",
                            "urn:mozilla:zap:identities");
@@ -541,6 +542,12 @@ Identity.rdfLiteralAttrib("urn:mozilla:zap:service",
 // registration_status: "registered"|"registering"|""
 Identity.rdfLiteralAttrib("urn:mozilla:zap:registration_status",
                           "", "global-ephemeral");
+// This is to provide an entrypoint for template recursion. see
+// e.g. calls.xul for usage and comments in
+// RDFUtils.js::rdfPointerAttrib:
+Identity.rdfPointerAttrib("urn:mozilla:zap:root",
+                          "urn:mozilla:zap:current-identity",
+                          "ephemeral");
 
 // make sure that we re-resolve the service when certain attributes change:
 Identity.rdfAttribTrigger(