diff --git a/passbook/admin/templates/administration/stage_binding/list.html b/passbook/admin/templates/administration/stage_binding/list.html
index efdf7f235..a4342cf0e 100644
--- a/passbook/admin/templates/administration/stage_binding/list.html
+++ b/passbook/admin/templates/administration/stage_binding/list.html
@@ -39,8 +39,8 @@
                 {% for flow in grouped_bindings %}
                     <tr role="role">
                         <td>
-                            {% blocktrans with name=flow.grouper.name %}
-                            Flow {{ name }}
+                            {% blocktrans with slug=flow.grouper.slug %}
+                            Flow {{ slug }}
                             {% endblocktrans %}
                         </td>
                         <td></td>
@@ -56,9 +56,9 @@
                         </td>
                         <th role="columnheader">
                             <div>
-                                <div>{{ binding.flow.name }}</div>
+                                <div>{{ binding.flow.slug }}</div>
                                 <small>
-                                    {{ binding.flow }}
+                                    {{ binding.flow.name }}
                                 </small>
                             </div>
                         </th>
diff --git a/passbook/stages/email/models.py b/passbook/stages/email/models.py
index bcdec174e..ddfe0f45a 100644
--- a/passbook/stages/email/models.py
+++ b/passbook/stages/email/models.py
@@ -21,7 +21,7 @@ class EmailTemplates(models.TextChoices):
 
 
 class EmailStage(Stage):
-    """email stage"""
+    """Email-based verification."""
 
     host = models.TextField(default="localhost")
     port = models.IntegerField(default=25)
diff --git a/passbook/stages/email/templates/stages/email/for_email/account_confirm.html b/passbook/stages/email/templates/stages/email/for_email/account_confirmation.html
similarity index 92%
rename from passbook/stages/email/templates/stages/email/for_email/account_confirm.html
rename to passbook/stages/email/templates/stages/email/for_email/account_confirmation.html
index 4c38ccf38..598601226 100644
--- a/passbook/stages/email/templates/stages/email/for_email/account_confirm.html
+++ b/passbook/stages/email/templates/stages/email/for_email/account_confirmation.html
@@ -1,6 +1,6 @@
-{% extends 'email/base.html' %}
+{% extends 'stages/email/for_email/base.html' %}
 
-{% load inline %}
+{% load passbook_stages_email %}
 {% load i18n %}
 
 {% block content %}
diff --git a/passbook/stages/email/templates/stages/email/for_email/generic_email.html b/passbook/stages/email/templates/stages/email/for_email/generic_email.html
index 915e16398..8246f93b6 100644
--- a/passbook/stages/email/templates/stages/email/for_email/generic_email.html
+++ b/passbook/stages/email/templates/stages/email/for_email/generic_email.html
@@ -1,4 +1,4 @@
-{% extends "email/base.html" %}
+{% extends "stages/email/for_email/base.html" %}
 
 {% block content %}
 <tr>