diff --git a/modules/security/src/main/EmailChange.scala b/modules/security/src/main/EmailChange.scala
index 9146413de7..6c50e1a3ec 100644
--- a/modules/security/src/main/EmailChange.scala
+++ b/modules/security/src/main/EmailChange.scala
@@ -58,7 +58,7 @@ ${Mailgun.txt.serviceNote}
       case _ => none
     }
     def write(a: Option[TokenPayload]) = a ?? {
-      case TokenPayload(userId, email) => s"$userId$sep$email"
+      case TokenPayload(userId, EmailAddress(email)) => s"$userId$sep$email"
     }
   }