diff --git a/app/mailers/magic_link_mailer.rb b/app/mailers/magic_link_mailer.rb
index 1008acfcf..617286f50 100644
--- a/app/mailers/magic_link_mailer.rb
+++ b/app/mailers/magic_link_mailer.rb
@@ -3,6 +3,6 @@ class MagicLinkMailer < ApplicationMailer
     @magic_link = magic_link
     @identity = @magic_link.identity
 
-    mail to: @identity.email_address, subject: "Your Fizzy verification code"
+    mail to: @identity.email_address, subject: "Your Fizzy code is #{ @magic_link.code }"
   end
 end
diff --git a/test/mailers/magic_link_mailer_test.rb b/test/mailers/magic_link_mailer_test.rb
index 7d389587f..2c8d692eb 100644
--- a/test/mailers/magic_link_mailer_test.rb
+++ b/test/mailers/magic_link_mailer_test.rb
@@ -10,7 +10,7 @@ class MagicLinkMailerTest < ActionMailer::TestCase
     end
 
     assert_equal [ "kevin@37signals.com" ], email.to
-    assert_equal "Your Fizzy verification code", email.subject
+    assert_equal "Your Fizzy code is #{ magic_link.code }", email.subject
     assert_match magic_link.code, email.body.encoded
   end
 end