2 files changed, 10 insertions, 5 deletions
diff --git a/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html b/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html
index 08879da5..a022c62a 100644
--- a/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html
+++ b/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html
@@ -17,9 +17,8 @@
 #}
 
 {% block persona_edit_link %}
-    <p>
-      <a href="{{ request.urlgen('mediagoblin.plugins.persona.edit') }}">
-          {% trans %}Edit your Persona email addresses{% endtrans %}
-      </a>
-    </p>
+  <a href="{{ request.urlgen('mediagoblin.plugins.persona.edit') }}">
+    {% trans %}Persona's{% endtrans %}
+  </a>
+  &middot;
 {% endblock %}
diff --git a/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/persona.html b/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/persona.html
index 372bd246..03d63aae 100644
--- a/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/persona.html
+++ b/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/persona.html
@@ -28,5 +28,11 @@
     <input type="hidden" name="assertion" type="text" id="_assertion"/>
     <input type="hidden" name="_logout_url" type="text" id="_logout_url"
       value="{{ request.urlgen('mediagoblin.auth.logout') }}"/>
+    <input type="hidden" type="text" id="_persona_user"
+      {% if request.session.get('persona_login_email', False) %}
+        value="{{ request.session['persona_login_email'] }}"/>
+      {% else %}
+        value=""/>
+      {% endif %}
   </form>
 {% endblock %}