diff --git a/elixir/apps/web/lib/web/mailer/auth_email/sign_in_link.html.heex b/elixir/apps/web/lib/web/mailer/auth_email/sign_in_link.html.heex
index 6e9acbf58..f614f427b 100644
--- a/elixir/apps/web/lib/web/mailer/auth_email/sign_in_link.html.heex
+++ b/elixir/apps/web/lib/web/mailer/auth_email/sign_in_link.html.heex
@@ -1,41 +1,241 @@
-
Sign in token
-
-
- Dear Firezone user,
-
-
-
-
- Please copy the token below and paste it into the Firezone application to proceed with
- signing in to "<%= @account.name %>":
-
-
-
- <%= @secret %>
-
-
-
- or click this link
- if you are on the same device where you are trying to sign in.
-
-
-
-
- This email is valid for 15 minutes.
-
-
-
-
-
- If you did not request this action and have received this email in error, you can safely ignore
- and discard this email. However, if you continue to receive multiple unsolicited emails of this nature,
- we strongly recommend contacting your system administrator to report the issue.
-
-
-
- Request details:
-
Time: <%= @sign_in_token_created_at %>
-
IP address: <%= @remote_ip %>
-
User Agent: <%= @user_agent %>
-
Account ID: <%= @account.id %>
-
+
+
+
+
+
+
+
+
+
+
+ Firezone Sign In Token
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Finish Signing In!
+
+
+ Copy and paste the following token into the Sign In form
+
+
+ <%= @secret %>
+
+
+ Or click the button below
+
+
+
+
+
+ This email will only be valid for 15 minutes
+
+
+
+
+
+ Request Details
+
+
+
+ |
+ Account
+ |
+ <%= @account.name %> |
+
+
+ |
+ Account ID
+ |
+ <%= @account.id %> |
+
+
+ |
+ Time
+ |
+ <%= @sign_in_token_created_at %> |
+
+
+ |
+ IP Address
+ |
+ <%= @remote_ip %> |
+
+
+ |
+ User Agent
+ |
+ <%= @user_agent %> |
+
+
+
+
+
+
+
+ If you didn't request this sign in, you can safely ignore this email. However, if you continue to receive multiple unsolicited emails of this nature,
+ we strongly recommend contacting your system administrator to report the issue.
+
+ Thanks, The Firezone Team
+
+
+ |
+
+
+ | |
+
+
+ |
+
+ Blazing-fast alternative to legacy VPNs
+
+
+
+ Docs
+
+ •
+
+ Github
+
+ •
+
+ X
+
+
+ |
+
+
+ |
+
+
+
+
+
+
diff --git a/elixir/apps/web/lib/web/mailer/auth_email/sign_in_link.text.heex b/elixir/apps/web/lib/web/mailer/auth_email/sign_in_link.text.heex
index dadbe3d76..7edb69235 100644
--- a/elixir/apps/web/lib/web/mailer/auth_email/sign_in_link.text.heex
+++ b/elixir/apps/web/lib/web/mailer/auth_email/sign_in_link.text.heex
@@ -1,11 +1,10 @@
-Dear Firezone user,
+Finish Signing In!
-Please copy the code and paste it into the Firezone application to proceed with
-the sign in to "<%= @account.name %>":
+Copy and paste the following token into the Sign In form
<%= @secret %>
-or click on the magic sign-in if you are on the same device where you are trying to sign in:
+or click on the following link if you are on the same device where you are trying to sign in:
<%= @sign_in_url %>
@@ -16,7 +15,8 @@ and discard this email. However, if you continue to receive multiple unsolicited
we strongly recommend contacting your system administrator to report the issue.
Request details:
+ Account: <%= @account.name %>
+ Account ID: <%= @account.id %>
Time: <%= @sign_in_token_created_at %>
IP address: <%= @remote_ip %>
User Agent: <%= @user_agent %>
- Account ID: <%= @account.id %>
diff --git a/elixir/apps/web/lib/web/mailer/auth_email/sign_up_link.html.heex b/elixir/apps/web/lib/web/mailer/auth_email/sign_up_link.html.heex
index 6197a2eac..4ae44d5b9 100644
--- a/elixir/apps/web/lib/web/mailer/auth_email/sign_up_link.html.heex
+++ b/elixir/apps/web/lib/web/mailer/auth_email/sign_up_link.html.heex
@@ -1,23 +1,217 @@
-Thank you for signing up for Firezone!
-
-
-
You can sign in to your account "<%= @account.name %>" using following link:
-
-
- <%= @sign_in_form_url %>
-
-
-
-
- If you did not request this action and have received this email in error, you can safely ignore
- and discard this email. However, if you continue to receive multiple unsolicited emails of this nature,
- we strongly recommend contacting your system administrator to report the issue.
-
-
-
- Request details:
-
IP address: <%= @remote_ip %>
-
User Agent: <%= @user_agent %>
-
Account ID: <%= @account.id %>
-
Account Slug: <%= @account.slug %>
-
+
+
+
+
+
+
+
+
+
+
+ Welcome to Firezone
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Welcome!
+
+
+ Thank you for signing up for Firezone!
+
+
+ Sign In to your account by clicking the button below:
+
+
+
+
+
+
+
+ Account Info:
+
+
+
+ |
+ Account Name
+ |
+ <%= @account.name %> |
+
+
+ |
+ Account Slug
+ |
+ <%= @account.slug %> |
+
+
+ |
+ Sign In URL
+ |
+
+ <%= @sign_in_form_url %>
+ |
+
+
+
+
+
+
+
+ If you didn't sign up for Firezone, you can safely ignore this email.
+ Thanks, The Firezone Team
+
+ |
+
+
+ | |
+
+
+ |
+
+ Blazing-fast alternative to legacy VPNs
+
+
+
+ Docs
+
+ •
+
+ Github
+
+ •
+
+ X
+
+
+ |
+
+
+ |
+
+
+
+
+
+
diff --git a/elixir/apps/web/test/web/controllers/auth_controller_test.exs b/elixir/apps/web/test/web/controllers/auth_controller_test.exs
index 70e9ae25b..29d0dca42 100644
--- a/elixir/apps/web/test/web/controllers/auth_controller_test.exs
+++ b/elixir/apps/web/test/web/controllers/auth_controller_test.exs
@@ -473,7 +473,7 @@ defmodule Web.AuthControllerTest do
assert_email_sent(fn email ->
assert email.subject == "Firezone sign in token"
- assert email.text_body =~ "Please copy the code and paste it into"
+ assert email.text_body =~ "Copy and paste the following token into the Sign In form"
end)
assert url = redirected_to(conn)
diff --git a/website/public/images/logo-lockup.png b/website/public/images/logo-lockup.png
new file mode 100644
index 000000000..17b856686
Binary files /dev/null and b/website/public/images/logo-lockup.png differ