diff --git a/.gitignore b/.gitignore
index 4cd5152..fcc590b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,7 +25,7 @@ cannery-*.tar
 # If NPM crashes, it generates a log, let's ignore it too.
 npm-debug.log
 
-# Ignore assets that are produced by build tools.
+# The directory NPM downloads your dependencies sources to.
 /assets/node_modules/
 
 # Since we are building assets from assets/,
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e88b56b..a4697b9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -63,7 +63,8 @@ And as always, thank you!
   [`phx_gen_auth`](https://hexdocs.pm/phx_gen_auth/).
 - `Dockerfile` and example `docker-compose.yml`
 - Automatic migrations in `MIX_ENV=prod` or Docker image
-- JS linting with [standard.js](https://standardjs.com)
+- JS linting with [standard.js](https://standardjs.com), HEEx linting with
+  [heex_formatter](https://github.com/feliperenan/heex_formatter)
 
 ## Docs
 
@@ -109,7 +110,7 @@ In `dev` mode, Cannery will listen for these environment variables at runtime.
 - `POOL_SIZE`: Controls the pool size to use with PostgreSQL. Defaults to `10`.
 - `REGISTRATION`: Controls if user sign-up should be invite only or set to public. Set to `public` to enable public registration. Defaults to `invite`.
 - `LOCALE`: Sets a custom default locale. Defaults to `en_US`.
-  - Available options: `en_US`, `de`, and `fr`
+  - Available options: `en_US`, `de`, `fr`, and `es`
 
 ## `MIX_ENV=test`
 
diff --git a/README.md b/README.md
index 30a5eed..c189a3b 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ You can use the following environment variables to configure Cannery in
 - `REGISTRATION`: Controls if user sign-up should be invite only or set to
   public. Set to `public` to enable public registration. Defaults to `invite`.
 - `LOCALE`: Sets a custom default locale. Defaults to `en_US`
-  - Available options: `en_US`, `de`, and `fr`
+  - Available options: `en_US`, `de`, `fr` and `es`
 - `SMTP_HOST`: The url for your SMTP email provider. Must be set
 - `SMTP_PORT`: The port for your SMTP relay. Defaults to `587`.
 - `SMTP_USERNAME`: The username for your SMTP relay. Must be set!
diff --git a/assets/css/components.scss b/assets/css/components.scss
index a8a18ad..d3c8d46 100644
--- a/assets/css/components.scss
+++ b/assets/css/components.scss
@@ -25,7 +25,6 @@
   }
 
   .btn {
-    @apply inline-block break-words;
     @apply focus:outline-none px-4 py-2 rounded-lg;
     @apply shadow-sm focus:shadow-lg;
     @apply transition-all duration-300 ease-in-out;
@@ -52,7 +51,6 @@
   }
 
   .link {
-    @apply inline-block break-words;
     @apply hover:underline;
     @apply transition-colors duration-500 ease-in-out;
   }
diff --git a/assets/static/images/phoenix.png b/assets/static/images/phoenix.png
new file mode 100644
index 0000000..9c81075
Binary files /dev/null and b/assets/static/images/phoenix.png differ
diff --git a/lib/cannery/accounts/email.ex b/lib/cannery/accounts/email.ex
index a8904a2..739cc23 100644
--- a/lib/cannery/accounts/email.ex
+++ b/lib/cannery/accounts/email.ex
@@ -27,21 +27,21 @@ defmodule Cannery.Email do
   @spec generate_email(key :: String.t(), User.t(), attrs :: map()) :: t()
   def generate_email("welcome", user, %{"url" => url}) do
     user
-    |> base_email(dgettext("emails", "Confirm your %{name} account", name: "Cannery"))
+    |> base_email(dgettext("emails", "Confirm your Cannery account"))
     |> render_body("confirm_email.html", %{user: user, url: url})
     |> text_body(EmailView.render("confirm_email.txt", %{user: user, url: url}))
   end
 
   def generate_email("reset_password", user, %{"url" => url}) do
     user
-    |> base_email(dgettext("emails", "Reset your %{name} password", name: "Cannery"))
+    |> base_email(dgettext("emails", "Reset your Cannery password"))
     |> render_body("reset_password.html", %{user: user, url: url})
     |> text_body(EmailView.render("reset_password.txt", %{user: user, url: url}))
   end
 
   def generate_email("update_email", user, %{"url" => url}) do
     user
-    |> base_email(dgettext("emails", "Update your %{name} email", name: "Cannery"))
+    |> base_email(dgettext("emails", "Update your Cannery email"))
     |> render_body("update_email.html", %{user: user, url: url})
     |> text_body(EmailView.render("update_email.txt", %{user: user, url: url}))
   end
diff --git a/lib/cannery/release.ex b/lib/cannery/release.ex
index c5c9eec..518be8e 100644
--- a/lib/cannery/release.ex
+++ b/lib/cannery/release.ex
@@ -9,7 +9,9 @@ defmodule Cannery.Release do
 
   def rollback(repo, version) do
     load_app()
-    {:ok, _fun, _opts} = Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :down, to: version))
+
+    {:ok, _fun_return, _apps} =
+      Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :down, to: version))
   end
 
   defp load_app do
@@ -20,7 +22,8 @@ defmodule Cannery.Release do
     load_app()
 
     for repo <- Application.fetch_env!(@app, :ecto_repos) do
-      {:ok, _fun, _opts} = Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :up, all: true))
+      {:ok, _fun_return, _apps} =
+        Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :up, all: true))
     end
   end
 end
diff --git a/lib/cannery/repo/migrator.ex b/lib/cannery/repo/migrator.ex
index 0f7c256..8b5cda9 100644
--- a/lib/cannery/repo/migrator.ex
+++ b/lib/cannery/repo/migrator.ex
@@ -1,6 +1,6 @@
 defmodule Cannery.Repo.Migrator do
   @moduledoc """
-  Genserver to automatically run migrations in prod env
+  Genserver to automatically perform all migration on app start
   """
 
   use GenServer
diff --git a/lib/cannery_web/components/topbar.ex b/lib/cannery_web/components/topbar.ex
index ca554b9..4cfe439 100644
--- a/lib/cannery_web/components/topbar.ex
+++ b/lib/cannery_web/components/topbar.ex
@@ -93,7 +93,7 @@ defmodule CanneryWeb.Components.Topbar do
             <% end %>
             <li class="mx-2 my-1">
               <.link
-                navigate={Routes.user_settings_path(Endpoint, :edit)}
+                href={Routes.user_settings_path(Endpoint, :edit)}
                 class="text-primary-600 text-white hover:underline truncate"
               >
                 <%= @current_user.email %>
@@ -108,29 +108,32 @@ defmodule CanneryWeb.Components.Topbar do
                 <i class="fas fa-sign-out-alt"></i>
               </.link>
             </li>
-            <%= if @current_user.role == :admin and function_exported?(Routes, :live_dashboard_path, 2) do %>
-              <li class="mx-2 my-1">
-                <.link
-                  navigate={Routes.live_dashboard_path(Endpoint, :home)}
-                  class="text-primary-600 text-white hover:underline"
-                >
-                  <i class="fas fa-gauge"></i>
-                </.link>
-              </li>
-            <% end %>
+            <li
+              :if={
+                @current_user.role == :admin and function_exported?(Routes, :live_dashboard_path, 2)
+              }
+              class="mx-2 my-1"
+            >
+              <.link
+                navigate={Routes.live_dashboard_path(Endpoint, :home)}
+                class="text-white text-white hover:underline"
+              >
+                <i class="fas fa-gauge"></i>
+              </.link>
+            </li>
           <% else %>
             <li :if={Accounts.allow_registration?()} class="mx-2 my-1">
               <.link
-                navigate={Routes.user_registration_path(Endpoint, :new)}
-                class="text-primary-600 text-white hover:underline truncate"
+                href={Routes.user_registration_path(Endpoint, :new)}
+                class="text-white hover:underline truncate"
               >
                 <%= dgettext("actions", "Register") %>
               </.link>
             </li>
             <li class="mx-2 my-1">
               <.link
-                navigate={Routes.user_session_path(Endpoint, :new)}
-                class="text-primary-600 text-white hover:underline truncate"
+                href={Routes.user_session_path(Endpoint, :new)}
+                class="text-white hover:underline truncate"
               >
                 <%= dgettext("actions", "Log in") %>
               </.link>
diff --git a/lib/cannery_web/controllers/home_controller.ex b/lib/cannery_web/controllers/home_controller.ex
index ff26174..36b570a 100644
--- a/lib/cannery_web/controllers/home_controller.ex
+++ b/lib/cannery_web/controllers/home_controller.ex
@@ -1,4 +1,8 @@
 defmodule CanneryWeb.HomeController do
+  @moduledoc """
+  Controller for home page
+  """
+
   use CanneryWeb, :controller
 
   def index(conn, _params) do
diff --git a/lib/cannery_web/templates/email/confirm_email.html.eex b/lib/cannery_web/templates/email/confirm_email.html.heex
similarity index 56%
rename from lib/cannery_web/templates/email/confirm_email.html.eex
rename to lib/cannery_web/templates/email/confirm_email.html.heex
index 6f6434c..ff6afc3 100644
--- a/lib/cannery_web/templates/email/confirm_email.html.eex
+++ b/lib/cannery_web/templates/email/confirm_email.html.heex
@@ -3,23 +3,21 @@
     <%= dgettext("emails", "Hi %{email},", email: @user.email) %>
   </span>
 
-  <br/>
+  <br />
 
   <span style="margin-bottom: 1em; font-size: 1.25em;">
-    <%= dgettext("emails", "Welcome to %{name}!", name: "Cannery") %>
+    <%= dgettext("emails", "Welcome to Cannery") %>
   </span>
 
-  <br/>
+  <br />
 
   <%= dgettext("emails", "You can confirm your account by visiting the URL below:") %>
 
-  <br/>
+  <br />
 
-  <a style="margin: 1em; color: rgb(31, 31, 31);" href="<%= @url %>"><%= @url %></a>
+  <a style="margin: 1em; color: rgb(31, 31, 31);" href={@url}><%= @url %></a>
 
-  <br/>
+  <br />
 
-  <%= dgettext("emails",
-    "If you didn't create an account at %{name}, please ignore this.",
-    name: "Cannery") %>
+  <%= dgettext("emails", "If you didn't create an account at Cannery, please ignore this.") %>
 </div>
diff --git a/lib/cannery_web/templates/email/confirm_email.txt.eex b/lib/cannery_web/templates/email/confirm_email.txt.eex
index 9f8ded8..ab03d87 100644
--- a/lib/cannery_web/templates/email/confirm_email.txt.eex
+++ b/lib/cannery_web/templates/email/confirm_email.txt.eex
@@ -1,7 +1,7 @@
 
 <%= dgettext("emails", "Hi %{email},", email: @user.email) %>
 
-<%= dgettext("emails", "Welcome to %{name}%!", name: "Cannery") %>
+<%= dgettext("emails", "Welcome to Cannery") %>
 
 <%= dgettext("emails", "You can confirm your account by visiting the URL below:") %>
 
diff --git a/lib/cannery_web/templates/email/reset_password.html.eex b/lib/cannery_web/templates/email/reset_password.html.heex
similarity index 58%
rename from lib/cannery_web/templates/email/reset_password.html.eex
rename to lib/cannery_web/templates/email/reset_password.html.heex
index 7251604..e983b93 100644
--- a/lib/cannery_web/templates/email/reset_password.html.eex
+++ b/lib/cannery_web/templates/email/reset_password.html.heex
@@ -3,17 +3,15 @@
     <%= dgettext("emails", "Hi %{email},", email: @user.email) %>
   </span>
 
-  <br/>
+  <br />
 
   <%= dgettext("emails", "You can reset your password by visiting the URL below:") %>
 
-  <br/>
+  <br />
 
-  <a style="margin: 1em; color: rgb(31, 31, 31);" href="<%= @url %>"><%= @url %></a>
+  <a style="margin: 1em; color: rgb(31, 31, 31);" href={@url}><%= @url %></a>
 
-  <br/>
+  <br />
 
-  <%= dgettext("emails",
-    "If you didn't request this change from %{name}, please ignore this.",
-    name: "Cannery") %>
+  <%= dgettext("emails", "If you didn't request this change from Cannery, please ignore this.") %>
 </div>
diff --git a/lib/cannery_web/templates/email/update_email.html.eex b/lib/cannery_web/templates/email/update_email.html.heex
similarity index 58%
rename from lib/cannery_web/templates/email/update_email.html.eex
rename to lib/cannery_web/templates/email/update_email.html.heex
index 8729876..f32b527 100644
--- a/lib/cannery_web/templates/email/update_email.html.eex
+++ b/lib/cannery_web/templates/email/update_email.html.heex
@@ -3,17 +3,18 @@
     <%= dgettext("emails", "Hi %{email},", email: @user.email) %>
   </span>
 
-  <br/>
+  <br />
 
   <%= dgettext("emails", "You can change your email by visiting the URL below:") %>
 
-  <br/>
+  <br />
 
-  <a style="margin: 1em; color: rgb(31, 31, 31);" href="<%= @url %>"><%= @url %></a>
+  <a style="margin: 1em; color: rgb(31, 31, 31);" href={@url}><%= @url %></a>
 
-  <br/>
+  <br />
 
-  <%= dgettext("emails",
-    "If you didn't request this change from %{name}, please ignore this.",
-    name: "Cannery") %>
+  <%= dgettext(
+    "emails",
+    "If you didn't request this change from Cannery, please ignore this."
+  ) %>
 </div>
diff --git a/lib/cannery_web/templates/error/error.html.heex b/lib/cannery_web/templates/error/error.html.heex
index 11c6cef..9927165 100644
--- a/lib/cannery_web/templates/error/error.html.heex
+++ b/lib/cannery_web/templates/error/error.html.heex
@@ -13,7 +13,7 @@
   </head>
   <body class="pb-8 m-0 p-0 w-full h-full">
     <header>
-      <.topbar current_user={assigns[:current_user]}></.topbar>
+      <.topbar current_user={assigns[:current_user]} />
     </header>
 
     <div class="pb-8 w-full flex flex-col justify-center items-center text-center">
diff --git a/lib/cannery_web/templates/layout/app.html.heex b/lib/cannery_web/templates/layout/app.html.heex
index 2d9d25e..e75a910 100644
--- a/lib/cannery_web/templates/layout/app.html.heex
+++ b/lib/cannery_web/templates/layout/app.html.heex
@@ -1,6 +1,6 @@
 <main role="main" class="min-h-full min-w-full">
   <header>
-    <.topbar current_user={assigns[:current_user]}></.topbar>
+    <.topbar current_user={assigns[:current_user]} />
 
     <div class="mx-8 my-2 flex flex-col space-y-4 text-center">
       <p :if={get_flash(@conn, :info)} class="alert alert-info" role="alert">
diff --git a/lib/cannery_web/templates/layout/email.html.heex b/lib/cannery_web/templates/layout/email.html.heex
index 04582e1..5dcb2b5 100644
--- a/lib/cannery_web/templates/layout/email.html.heex
+++ b/lib/cannery_web/templates/layout/email.html.heex
@@ -12,8 +12,7 @@
     <a style="color: rgb(31, 31, 31);" href={Routes.live_url(Endpoint, HomeLive)}>
       <%= dgettext(
         "emails",
-        "This email was sent from %{name}, the self-hosted firearm tracker website.",
-        name: "Cannery"
+        "This email was sent from Cannery, the self-hosted firearm tracker website."
       ) %>
     </a>
   </body>
diff --git a/lib/cannery_web/templates/layout/email.txt.eex b/lib/cannery_web/templates/layout/email.txt.eex
index 201cd66..72dac7e 100644
--- a/lib/cannery_web/templates/layout/email.txt.eex
+++ b/lib/cannery_web/templates/layout/email.txt.eex
@@ -7,6 +7,5 @@
 =====================
 
 <%= dgettext("emails",
-  "This email was sent from %{name} at %{url}, the self-hosted firearm tracker website.",
-  name: "Cannery",
+  "This email was sent from Cannery at %{url}, the self-hosted firearm tracker website.",
   url: Routes.live_url(Endpoint, HomeLive)) %>
diff --git a/lib/cannery_web/templates/layout/live.html.heex b/lib/cannery_web/templates/layout/live.html.heex
index 2e7d9f9..eb0ac37 100644
--- a/lib/cannery_web/templates/layout/live.html.heex
+++ b/lib/cannery_web/templates/layout/live.html.heex
@@ -1,6 +1,6 @@
 <main class="pb-8 min-w-full">
   <header>
-    <.topbar current_user={assigns[:current_user]}></.topbar>
+    <.topbar current_user={assigns[:current_user]} />
 
     <div class="mx-8 my-2 flex flex-col space-y-4 text-center">
       <p
diff --git a/lib/cannery_web/templates/user_reset_password/edit.html.heex b/lib/cannery_web/templates/user_reset_password/edit.html.heex
index 1883110..d116a39 100644
--- a/lib/cannery_web/templates/user_reset_password/edit.html.heex
+++ b/lib/cannery_web/templates/user_reset_password/edit.html.heex
@@ -9,11 +9,9 @@
     action={Routes.user_reset_password_path(@conn, :update, @token)}
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
-    <div :if={@changeset.action && not @changeset.valid?()} class="alert alert-danger col-span-3">
-      <p>
-        <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
-      </p>
-    </div>
+    <p :if={@changeset.action && not @changeset.valid?()} class="alert alert-danger col-span-3">
+      <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
+    </p>
 
     <%= label(f, :password, gettext("New password"), class: "title text-lg text-primary-600") %>
     <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
diff --git a/lib/cannery_web/templates/user_session/new.html.heex b/lib/cannery_web/templates/user_session/new.html.heex
index 4a2f629..0e3539f 100644
--- a/lib/cannery_web/templates/user_session/new.html.heex
+++ b/lib/cannery_web/templates/user_session/new.html.heex
@@ -10,11 +10,9 @@
     as="user"
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
-    <div :if={@error_message} class="alert alert-danger col-span-3">
-      <p>
-        <%= @error_message %>
-      </p>
-    </div>
+    <p :if={@error_message} class="alert alert-danger col-span-3">
+      <%= @error_message %>
+    </p>
 
     <%= label(f, :email, gettext("Email"), class: "title text-lg text-primary-600") %>
     <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
diff --git a/lib/cannery_web/views/error_view.ex b/lib/cannery_web/views/error_view.ex
index 4073755..b93bf8d 100644
--- a/lib/cannery_web/views/error_view.ex
+++ b/lib/cannery_web/views/error_view.ex
@@ -8,7 +8,7 @@ defmodule CanneryWeb.ErrorView do
       case error_path do
         "404.html" -> dgettext("errors", "Not found")
         "401.html" -> dgettext("errors", "Unauthorized")
-        _other_template -> dgettext("errors", "Internal Server Error")
+        _other_path -> dgettext("errors", "Internal Server Error")
       end
 
     render("error.html", %{error_string: error_string})
diff --git a/priv/gettext/actions.pot b/priv/gettext/actions.pot
index 03486c7..cf61716 100644
--- a/priv/gettext/actions.pot
+++ b/priv/gettext/actions.pot
@@ -56,7 +56,7 @@ msgstr ""
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:47
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:44
+#: lib/cannery_web/templates/user_session/new.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Forgot your password?"
 msgstr ""
@@ -66,13 +66,13 @@ msgstr ""
 msgid "Invite someone new!"
 msgstr ""
 
-#: lib/cannery_web/components/topbar.ex:135
+#: lib/cannery_web/components/topbar.ex:138
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:31
 #: lib/cannery_web/templates/user_registration/new.html.heex:44
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:47
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:45
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:31
 #: lib/cannery_web/templates/user_session/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:30
+#: lib/cannery_web/templates/user_session/new.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr ""
@@ -97,13 +97,13 @@ msgstr ""
 msgid "New Tag"
 msgstr ""
 
-#: lib/cannery_web/components/topbar.ex:127
+#: lib/cannery_web/components/topbar.ex:130
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:28
 #: lib/cannery_web/templates/user_registration/new.html.heex:3
 #: lib/cannery_web/templates/user_registration/new.html.heex:37
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:44
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:42
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:28
-#: lib/cannery_web/templates/user_session/new.html.heex:41
+#: lib/cannery_web/templates/user_session/new.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr ""
@@ -115,7 +115,7 @@ msgid "Resend confirmation instructions"
 msgstr ""
 
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:3
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:31
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Reset password"
 msgstr ""
diff --git a/priv/gettext/de/LC_MESSAGES/actions.po b/priv/gettext/de/LC_MESSAGES/actions.po
index 01a3107..239eae6 100644
--- a/priv/gettext/de/LC_MESSAGES/actions.po
+++ b/priv/gettext/de/LC_MESSAGES/actions.po
@@ -69,7 +69,7 @@ msgstr "Benutzer löschen"
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:47
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:44
+#: lib/cannery_web/templates/user_session/new.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
@@ -79,13 +79,13 @@ msgstr "Passwort vergessen?"
 msgid "Invite someone new!"
 msgstr "Laden Sie jemanden ein!"
 
-#: lib/cannery_web/components/topbar.ex:135
+#: lib/cannery_web/components/topbar.ex:138
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:31
 #: lib/cannery_web/templates/user_registration/new.html.heex:44
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:47
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:45
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:31
 #: lib/cannery_web/templates/user_session/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:30
+#: lib/cannery_web/templates/user_session/new.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr "Einloggen"
@@ -110,13 +110,13 @@ msgstr "Neuer Behälter"
 msgid "New Tag"
 msgstr "Neuer Tag"
 
-#: lib/cannery_web/components/topbar.ex:127
+#: lib/cannery_web/components/topbar.ex:130
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:28
 #: lib/cannery_web/templates/user_registration/new.html.heex:3
 #: lib/cannery_web/templates/user_registration/new.html.heex:37
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:44
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:42
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:28
-#: lib/cannery_web/templates/user_session/new.html.heex:41
+#: lib/cannery_web/templates/user_session/new.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr "Registrieren"
@@ -128,7 +128,7 @@ msgid "Resend confirmation instructions"
 msgstr "Bestätigungsmail erneut senden"
 
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:3
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:31
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index c15600b..827a899 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -195,7 +195,7 @@ msgstr "Nur mit Einladung"
 msgid "Invites"
 msgstr "Einladungen"
 
-#: lib/cannery_web/templates/user_session/new.html.heex:25
+#: lib/cannery_web/templates/user_session/new.html.heex:23
 #, elixir-autogen, elixir-format
 msgid "Keep me logged in for 60 days"
 msgstr "Für 60 Tage eingeloggt bleiben"
@@ -574,7 +574,7 @@ msgstr "Pulverart"
 msgid "UPC"
 msgstr "UPC"
 
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:22
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:20
 #: lib/cannery_web/templates/user_settings/edit.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "Confirm new password"
@@ -586,7 +586,7 @@ msgstr "Passwort bestätigen"
 msgid "Current password"
 msgstr "Derzeitiges Passwort"
 
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:18
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
 #: lib/cannery_web/templates/user_settings/edit.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "New password"
@@ -1203,14 +1203,14 @@ msgstr ""
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:12
 #: lib/cannery_web/templates/user_registration/new.html.heex:20
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:12
-#: lib/cannery_web/templates/user_session/new.html.heex:19
+#: lib/cannery_web/templates/user_session/new.html.heex:17
 #: lib/cannery_web/templates/user_settings/edit.html.heex:27
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr ""
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:24
-#: lib/cannery_web/templates/user_session/new.html.heex:22
+#: lib/cannery_web/templates/user_session/new.html.heex:20
 #, elixir-autogen, elixir-format
 msgid "Password"
 msgstr ""
diff --git a/priv/gettext/de/LC_MESSAGES/emails.po b/priv/gettext/de/LC_MESSAGES/emails.po
index 27e24dd..0545236 100644
--- a/priv/gettext/de/LC_MESSAGES/emails.po
+++ b/priv/gettext/de/LC_MESSAGES/emails.po
@@ -14,25 +14,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.11.2\n"
 
-## This file is a PO Template file.
-##
-## "msgid"s here are often extracted from source code.
-## Add new translations manually only if they're dynamic
-## translations that can't be statically extracted.
-##
-## Run "mix gettext.extract" to bring this file up to
-## date. Leave "msgstr"s empty as changing them here has no
-## effect: edit them in PO (.po) files instead.
-#: lib/cannery/accounts/email.ex:30
-#, elixir-autogen, elixir-format
-msgid "Confirm your %{name} account"
-msgstr "Bestätigen Sie ihr %{name} Nutzerkonto"
-
-#: lib/cannery_web/templates/email/confirm_email.html.eex:3
+#: lib/cannery_web/templates/email/confirm_email.html.heex:3
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:2
-#: lib/cannery_web/templates/email/reset_password.html.eex:3
+#: lib/cannery_web/templates/email/reset_password.html.heex:3
 #: lib/cannery_web/templates/email/reset_password.txt.eex:2
-#: lib/cannery_web/templates/email/update_email.html.eex:3
+#: lib/cannery_web/templates/email/update_email.html.heex:3
 #: lib/cannery_web/templates/email/update_email.txt.eex:2
 #, elixir-autogen, elixir-format
 msgid "Hi %{email},"
@@ -53,69 +39,79 @@ msgstr ""
 "Falls Sie diese Änderung von %{url} nicht angefordert haben, ignorieren Sie "
 "bitte diese Nachricht."
 
-#: lib/cannery/accounts/email.ex:37
-#, elixir-autogen, elixir-format
-msgid "Reset your %{name} password"
-msgstr "Passwort für %{name} zurücksetzen"
-
-#: lib/cannery/accounts/email.ex:44
-#, elixir-autogen, elixir-format
-msgid "Update your %{name} email"
-msgstr "Aktualisieren Sie %{name} Mailadresse"
-
-#: lib/cannery_web/templates/email/confirm_email.html.eex:9
-#, elixir-autogen, elixir-format
-msgid "Welcome to %{name}!"
-msgstr "Willkommen %{name}!"
-
-#: lib/cannery_web/templates/email/confirm_email.txt.eex:4
-#, elixir-autogen, elixir-format
-msgid "Welcome to %{name}%!"
-msgstr "Willkommen %{name}%!"
-
-#: lib/cannery_web/templates/email/update_email.html.eex:8
+#: lib/cannery_web/templates/email/update_email.html.heex:8
 #: lib/cannery_web/templates/email/update_email.txt.eex:4
 #, elixir-autogen, elixir-format
 msgid "You can change your email by visiting the URL below:"
 msgstr "Sie können Ihre Mailadresse unter folgender URL ändern:"
 
-#: lib/cannery_web/templates/email/confirm_email.html.eex:14
+#: lib/cannery_web/templates/email/confirm_email.html.heex:14
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:6
 #, elixir-autogen, elixir-format
 msgid "You can confirm your account by visiting the URL below:"
 msgstr "Sie können Ihr Nutzerkonto unter folgender URL bestätigen:"
 
-#: lib/cannery_web/templates/email/reset_password.html.eex:8
+#: lib/cannery_web/templates/email/reset_password.html.heex:8
 #: lib/cannery_web/templates/email/reset_password.txt.eex:4
 #, elixir-autogen, elixir-format
 msgid "You can reset your password by visiting the URL below:"
 msgstr "Sie können ihr Passwort unter folgender URL zurücksetzen:"
 
-#: lib/cannery_web/templates/email/confirm_email.html.eex:22
-#, elixir-autogen, elixir-format
-msgid "If you didn't create an account at %{name}, please ignore this."
+## This file is a PO Template file.
+##
+## "msgid"s here are often extracted from source code.
+## Add new translations manually only if they're dynamic
+## translations that can't be statically extracted.
+##
+## Run "mix gettext.extract" to bring this file up to
+## date. Leave "msgstr"s empty as changing them here has no
+## effect: edit them in PO (.po) files instead.
+#: lib/cannery/accounts/email.ex:30
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Confirm your Cannery account"
+msgstr "Bestätigen Sie ihr %{name} Nutzerkonto"
+
+#: lib/cannery_web/templates/email/confirm_email.html.heex:22
+#, elixir-autogen, elixir-format, fuzzy
+msgid "If you didn't create an account at Cannery, please ignore this."
 msgstr ""
 "Falls SIe dieses Nutzerkonto unter %{name}, nicht erstellt haben, ignorieren "
 "Sie diese Nachricht bitte."
 
-#: lib/cannery_web/templates/email/reset_password.html.eex:16
-#: lib/cannery_web/templates/email/update_email.html.eex:16
-#, elixir-autogen, elixir-format
-msgid "If you didn't request this change from %{name}, please ignore this."
+#: lib/cannery_web/templates/email/reset_password.html.heex:16
+#: lib/cannery_web/templates/email/update_email.html.heex:16
+#, elixir-autogen, elixir-format, fuzzy
+msgid "If you didn't request this change from Cannery, please ignore this."
 msgstr ""
 "Falls Sie die Änderung von %{name} nicht angefragt haben, ignorieren Sie "
 "diese Nachricht bitte."
 
+#: lib/cannery/accounts/email.ex:37
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Reset your Cannery password"
+msgstr "Passwort für %{name} zurücksetzen"
+
 #: lib/cannery_web/templates/layout/email.txt.eex:9
-#, elixir-autogen, elixir-format
-msgid "This email was sent from %{name} at %{url}, the self-hosted firearm tracker website."
+#, elixir-autogen, elixir-format, fuzzy
+msgid "This email was sent from Cannery at %{url}, the self-hosted firearm tracker website."
 msgstr ""
 "Diese Nachricht wurde von %{name} unter %{url} gesandt, einem selbst-"
 "gehosteten Schusswaffenmanager."
 
 #: lib/cannery_web/templates/layout/email.html.heex:13
-#, elixir-autogen, elixir-format
-msgid "This email was sent from %{name}, the self-hosted firearm tracker website."
+#, elixir-autogen, elixir-format, fuzzy
+msgid "This email was sent from Cannery, the self-hosted firearm tracker website."
 msgstr ""
 "Diese Nachricht wurde von %{name} gesandt, einem selbst-gehosteten "
 "Schusswaffenmanager."
+
+#: lib/cannery/accounts/email.ex:44
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Update your Cannery email"
+msgstr "Aktualisieren Sie %{name} Mailadresse"
+
+#: lib/cannery_web/templates/email/confirm_email.html.heex:9
+#: lib/cannery_web/templates/email/confirm_email.txt.eex:4
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Welcome to Cannery"
+msgstr "Willkommen %{name}!"
diff --git a/priv/gettext/de/LC_MESSAGES/errors.po b/priv/gettext/de/LC_MESSAGES/errors.po
index 8eb2022..94e0175 100644
--- a/priv/gettext/de/LC_MESSAGES/errors.po
+++ b/priv/gettext/de/LC_MESSAGES/errors.po
@@ -70,7 +70,7 @@ msgid "Not found"
 msgstr "Nicht gefunden"
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:13
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:14
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:13
 #: lib/cannery_web/templates/user_settings/edit.html.heex:22
 #: lib/cannery_web/templates/user_settings/edit.html.heex:64
 #: lib/cannery_web/templates/user_settings/edit.html.heex:118
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index a8b8294..3746679 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -191,7 +191,7 @@ msgstr ""
 msgid "Invites"
 msgstr ""
 
-#: lib/cannery_web/templates/user_session/new.html.heex:25
+#: lib/cannery_web/templates/user_session/new.html.heex:23
 #, elixir-autogen, elixir-format
 msgid "Keep me logged in for 60 days"
 msgstr ""
@@ -568,7 +568,7 @@ msgstr ""
 msgid "UPC"
 msgstr ""
 
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:22
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:20
 #: lib/cannery_web/templates/user_settings/edit.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "Confirm new password"
@@ -580,7 +580,7 @@ msgstr ""
 msgid "Current password"
 msgstr ""
 
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:18
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
 #: lib/cannery_web/templates/user_settings/edit.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "New password"
@@ -1186,14 +1186,14 @@ msgstr ""
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:12
 #: lib/cannery_web/templates/user_registration/new.html.heex:20
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:12
-#: lib/cannery_web/templates/user_session/new.html.heex:19
+#: lib/cannery_web/templates/user_session/new.html.heex:17
 #: lib/cannery_web/templates/user_settings/edit.html.heex:27
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr ""
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:24
-#: lib/cannery_web/templates/user_session/new.html.heex:22
+#: lib/cannery_web/templates/user_session/new.html.heex:20
 #, elixir-autogen, elixir-format
 msgid "Password"
 msgstr ""
diff --git a/priv/gettext/emails.pot b/priv/gettext/emails.pot
index 76f04e0..b2aa6a7 100644
--- a/priv/gettext/emails.pot
+++ b/priv/gettext/emails.pot
@@ -10,16 +10,11 @@
 msgid ""
 msgstr ""
 
-#: lib/cannery/accounts/email.ex:30
-#, elixir-autogen, elixir-format
-msgid "Confirm your %{name} account"
-msgstr ""
-
-#: lib/cannery_web/templates/email/confirm_email.html.eex:3
+#: lib/cannery_web/templates/email/confirm_email.html.heex:3
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:2
-#: lib/cannery_web/templates/email/reset_password.html.eex:3
+#: lib/cannery_web/templates/email/reset_password.html.heex:3
 #: lib/cannery_web/templates/email/reset_password.txt.eex:2
-#: lib/cannery_web/templates/email/update_email.html.eex:3
+#: lib/cannery_web/templates/email/update_email.html.heex:3
 #: lib/cannery_web/templates/email/update_email.txt.eex:2
 #, elixir-autogen, elixir-format
 msgid "Hi %{email},"
@@ -36,61 +31,62 @@ msgstr ""
 msgid "If you didn't request this change from %{url}, please ignore this."
 msgstr ""
 
-#: lib/cannery/accounts/email.ex:37
-#, elixir-autogen, elixir-format
-msgid "Reset your %{name} password"
-msgstr ""
-
-#: lib/cannery/accounts/email.ex:44
-#, elixir-autogen, elixir-format
-msgid "Update your %{name} email"
-msgstr ""
-
-#: lib/cannery_web/templates/email/confirm_email.html.eex:9
-#, elixir-autogen, elixir-format
-msgid "Welcome to %{name}!"
-msgstr ""
-
-#: lib/cannery_web/templates/email/confirm_email.txt.eex:4
-#, elixir-autogen, elixir-format
-msgid "Welcome to %{name}%!"
-msgstr ""
-
-#: lib/cannery_web/templates/email/update_email.html.eex:8
+#: lib/cannery_web/templates/email/update_email.html.heex:8
 #: lib/cannery_web/templates/email/update_email.txt.eex:4
 #, elixir-autogen, elixir-format
 msgid "You can change your email by visiting the URL below:"
 msgstr ""
 
-#: lib/cannery_web/templates/email/confirm_email.html.eex:14
+#: lib/cannery_web/templates/email/confirm_email.html.heex:14
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:6
 #, elixir-autogen, elixir-format
 msgid "You can confirm your account by visiting the URL below:"
 msgstr ""
 
-#: lib/cannery_web/templates/email/reset_password.html.eex:8
+#: lib/cannery_web/templates/email/reset_password.html.heex:8
 #: lib/cannery_web/templates/email/reset_password.txt.eex:4
 #, elixir-autogen, elixir-format
 msgid "You can reset your password by visiting the URL below:"
 msgstr ""
 
-#: lib/cannery_web/templates/email/confirm_email.html.eex:22
+#: lib/cannery/accounts/email.ex:30
 #, elixir-autogen, elixir-format
-msgid "If you didn't create an account at %{name}, please ignore this."
+msgid "Confirm your Cannery account"
 msgstr ""
 
-#: lib/cannery_web/templates/email/reset_password.html.eex:16
-#: lib/cannery_web/templates/email/update_email.html.eex:16
+#: lib/cannery_web/templates/email/confirm_email.html.heex:22
 #, elixir-autogen, elixir-format
-msgid "If you didn't request this change from %{name}, please ignore this."
+msgid "If you didn't create an account at Cannery, please ignore this."
+msgstr ""
+
+#: lib/cannery_web/templates/email/reset_password.html.heex:16
+#: lib/cannery_web/templates/email/update_email.html.heex:16
+#, elixir-autogen, elixir-format
+msgid "If you didn't request this change from Cannery, please ignore this."
+msgstr ""
+
+#: lib/cannery/accounts/email.ex:37
+#, elixir-autogen, elixir-format
+msgid "Reset your Cannery password"
 msgstr ""
 
 #: lib/cannery_web/templates/layout/email.txt.eex:9
 #, elixir-autogen, elixir-format
-msgid "This email was sent from %{name} at %{url}, the self-hosted firearm tracker website."
+msgid "This email was sent from Cannery at %{url}, the self-hosted firearm tracker website."
 msgstr ""
 
 #: lib/cannery_web/templates/layout/email.html.heex:13
 #, elixir-autogen, elixir-format
-msgid "This email was sent from %{name}, the self-hosted firearm tracker website."
+msgid "This email was sent from Cannery, the self-hosted firearm tracker website."
+msgstr ""
+
+#: lib/cannery/accounts/email.ex:44
+#, elixir-autogen, elixir-format
+msgid "Update your Cannery email"
+msgstr ""
+
+#: lib/cannery_web/templates/email/confirm_email.html.heex:9
+#: lib/cannery_web/templates/email/confirm_email.txt.eex:4
+#, elixir-autogen, elixir-format
+msgid "Welcome to Cannery"
 msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/actions.po b/priv/gettext/en/LC_MESSAGES/actions.po
index 761a772..d8eb01d 100644
--- a/priv/gettext/en/LC_MESSAGES/actions.po
+++ b/priv/gettext/en/LC_MESSAGES/actions.po
@@ -56,7 +56,7 @@ msgstr ""
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:47
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:44
+#: lib/cannery_web/templates/user_session/new.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Forgot your password?"
 msgstr ""
@@ -66,13 +66,13 @@ msgstr ""
 msgid "Invite someone new!"
 msgstr ""
 
-#: lib/cannery_web/components/topbar.ex:135
+#: lib/cannery_web/components/topbar.ex:138
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:31
 #: lib/cannery_web/templates/user_registration/new.html.heex:44
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:47
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:45
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:31
 #: lib/cannery_web/templates/user_session/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:30
+#: lib/cannery_web/templates/user_session/new.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr ""
@@ -97,13 +97,13 @@ msgstr ""
 msgid "New Tag"
 msgstr ""
 
-#: lib/cannery_web/components/topbar.ex:127
+#: lib/cannery_web/components/topbar.ex:130
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:28
 #: lib/cannery_web/templates/user_registration/new.html.heex:3
 #: lib/cannery_web/templates/user_registration/new.html.heex:37
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:44
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:42
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:28
-#: lib/cannery_web/templates/user_session/new.html.heex:41
+#: lib/cannery_web/templates/user_session/new.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr ""
@@ -115,7 +115,7 @@ msgid "Resend confirmation instructions"
 msgstr ""
 
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:3
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:31
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Reset password"
 msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index c628d8b..3cad647 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -191,7 +191,7 @@ msgstr ""
 msgid "Invites"
 msgstr ""
 
-#: lib/cannery_web/templates/user_session/new.html.heex:25
+#: lib/cannery_web/templates/user_session/new.html.heex:23
 #, elixir-autogen, elixir-format
 msgid "Keep me logged in for 60 days"
 msgstr ""
@@ -568,7 +568,7 @@ msgstr ""
 msgid "UPC"
 msgstr ""
 
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:22
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:20
 #: lib/cannery_web/templates/user_settings/edit.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "Confirm new password"
@@ -580,7 +580,7 @@ msgstr ""
 msgid "Current password"
 msgstr ""
 
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:18
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
 #: lib/cannery_web/templates/user_settings/edit.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "New password"
@@ -1186,14 +1186,14 @@ msgstr ""
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:12
 #: lib/cannery_web/templates/user_registration/new.html.heex:20
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:12
-#: lib/cannery_web/templates/user_session/new.html.heex:19
+#: lib/cannery_web/templates/user_session/new.html.heex:17
 #: lib/cannery_web/templates/user_settings/edit.html.heex:27
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr ""
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:24
-#: lib/cannery_web/templates/user_session/new.html.heex:22
+#: lib/cannery_web/templates/user_session/new.html.heex:20
 #, elixir-autogen, elixir-format
 msgid "Password"
 msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/emails.po b/priv/gettext/en/LC_MESSAGES/emails.po
index 2e59981..cb860a4 100644
--- a/priv/gettext/en/LC_MESSAGES/emails.po
+++ b/priv/gettext/en/LC_MESSAGES/emails.po
@@ -10,16 +10,11 @@ msgid ""
 msgstr ""
 "Language: en\n"
 
-#: lib/cannery/accounts/email.ex:30
-#, elixir-autogen, elixir-format
-msgid "Confirm your %{name} account"
-msgstr ""
-
-#: lib/cannery_web/templates/email/confirm_email.html.eex:3
+#: lib/cannery_web/templates/email/confirm_email.html.heex:3
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:2
-#: lib/cannery_web/templates/email/reset_password.html.eex:3
+#: lib/cannery_web/templates/email/reset_password.html.heex:3
 #: lib/cannery_web/templates/email/reset_password.txt.eex:2
-#: lib/cannery_web/templates/email/update_email.html.eex:3
+#: lib/cannery_web/templates/email/update_email.html.heex:3
 #: lib/cannery_web/templates/email/update_email.txt.eex:2
 #, elixir-autogen, elixir-format
 msgid "Hi %{email},"
@@ -36,61 +31,62 @@ msgstr ""
 msgid "If you didn't request this change from %{url}, please ignore this."
 msgstr ""
 
-#: lib/cannery/accounts/email.ex:37
-#, elixir-autogen, elixir-format
-msgid "Reset your %{name} password"
-msgstr ""
-
-#: lib/cannery/accounts/email.ex:44
-#, elixir-autogen, elixir-format
-msgid "Update your %{name} email"
-msgstr ""
-
-#: lib/cannery_web/templates/email/confirm_email.html.eex:9
-#, elixir-autogen, elixir-format
-msgid "Welcome to %{name}!"
-msgstr ""
-
-#: lib/cannery_web/templates/email/confirm_email.txt.eex:4
-#, elixir-autogen, elixir-format
-msgid "Welcome to %{name}%!"
-msgstr ""
-
-#: lib/cannery_web/templates/email/update_email.html.eex:8
+#: lib/cannery_web/templates/email/update_email.html.heex:8
 #: lib/cannery_web/templates/email/update_email.txt.eex:4
 #, elixir-autogen, elixir-format
 msgid "You can change your email by visiting the URL below:"
 msgstr ""
 
-#: lib/cannery_web/templates/email/confirm_email.html.eex:14
+#: lib/cannery_web/templates/email/confirm_email.html.heex:14
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:6
 #, elixir-autogen, elixir-format
 msgid "You can confirm your account by visiting the URL below:"
 msgstr ""
 
-#: lib/cannery_web/templates/email/reset_password.html.eex:8
+#: lib/cannery_web/templates/email/reset_password.html.heex:8
 #: lib/cannery_web/templates/email/reset_password.txt.eex:4
 #, elixir-autogen, elixir-format
 msgid "You can reset your password by visiting the URL below:"
 msgstr ""
 
-#: lib/cannery_web/templates/email/confirm_email.html.eex:22
-#, elixir-autogen, elixir-format
-msgid "If you didn't create an account at %{name}, please ignore this."
+#: lib/cannery/accounts/email.ex:30
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Confirm your Cannery account"
 msgstr ""
 
-#: lib/cannery_web/templates/email/reset_password.html.eex:16
-#: lib/cannery_web/templates/email/update_email.html.eex:16
-#, elixir-autogen, elixir-format
-msgid "If you didn't request this change from %{name}, please ignore this."
+#: lib/cannery_web/templates/email/confirm_email.html.heex:22
+#, elixir-autogen, elixir-format, fuzzy
+msgid "If you didn't create an account at Cannery, please ignore this."
+msgstr ""
+
+#: lib/cannery_web/templates/email/reset_password.html.heex:16
+#: lib/cannery_web/templates/email/update_email.html.heex:16
+#, elixir-autogen, elixir-format, fuzzy
+msgid "If you didn't request this change from Cannery, please ignore this."
+msgstr ""
+
+#: lib/cannery/accounts/email.ex:37
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Reset your Cannery password"
 msgstr ""
 
 #: lib/cannery_web/templates/layout/email.txt.eex:9
-#, elixir-autogen, elixir-format
-msgid "This email was sent from %{name} at %{url}, the self-hosted firearm tracker website."
+#, elixir-autogen, elixir-format, fuzzy
+msgid "This email was sent from Cannery at %{url}, the self-hosted firearm tracker website."
 msgstr ""
 
 #: lib/cannery_web/templates/layout/email.html.heex:13
-#, elixir-autogen, elixir-format
-msgid "This email was sent from %{name}, the self-hosted firearm tracker website."
+#, elixir-autogen, elixir-format, fuzzy
+msgid "This email was sent from Cannery, the self-hosted firearm tracker website."
+msgstr ""
+
+#: lib/cannery/accounts/email.ex:44
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Update your Cannery email"
+msgstr ""
+
+#: lib/cannery_web/templates/email/confirm_email.html.heex:9
+#: lib/cannery_web/templates/email/confirm_email.txt.eex:4
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Welcome to Cannery"
 msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/errors.po b/priv/gettext/en/LC_MESSAGES/errors.po
index 32cbb88..0c81b9a 100644
--- a/priv/gettext/en/LC_MESSAGES/errors.po
+++ b/priv/gettext/en/LC_MESSAGES/errors.po
@@ -57,7 +57,7 @@ msgid "Not found"
 msgstr ""
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:13
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:14
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:13
 #: lib/cannery_web/templates/user_settings/edit.html.heex:22
 #: lib/cannery_web/templates/user_settings/edit.html.heex:64
 #: lib/cannery_web/templates/user_settings/edit.html.heex:118
diff --git a/priv/gettext/errors.pot b/priv/gettext/errors.pot
index c9a01a0..c8ba4b7 100644
--- a/priv/gettext/errors.pot
+++ b/priv/gettext/errors.pot
@@ -57,7 +57,7 @@ msgid "Not found"
 msgstr ""
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:13
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:14
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:13
 #: lib/cannery_web/templates/user_settings/edit.html.heex:22
 #: lib/cannery_web/templates/user_settings/edit.html.heex:64
 #: lib/cannery_web/templates/user_settings/edit.html.heex:118
diff --git a/priv/gettext/es/LC_MESSAGES/actions.po b/priv/gettext/es/LC_MESSAGES/actions.po
index b4267da..cd446ec 100644
--- a/priv/gettext/es/LC_MESSAGES/actions.po
+++ b/priv/gettext/es/LC_MESSAGES/actions.po
@@ -69,7 +69,7 @@ msgstr "Eliminar cuenta de Usuario"
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:47
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:44
+#: lib/cannery_web/templates/user_session/new.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Forgot your password?"
 msgstr "¿Has olvidado tu contraseña?"
@@ -79,13 +79,13 @@ msgstr "¿Has olvidado tu contraseña?"
 msgid "Invite someone new!"
 msgstr "¡Invita a alguien nuevo!"
 
-#: lib/cannery_web/components/topbar.ex:135
+#: lib/cannery_web/components/topbar.ex:138
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:31
 #: lib/cannery_web/templates/user_registration/new.html.heex:44
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:47
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:45
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:31
 #: lib/cannery_web/templates/user_session/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:30
+#: lib/cannery_web/templates/user_session/new.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr "Entrar"
@@ -110,13 +110,13 @@ msgstr "Nuevo Contenedor"
 msgid "New Tag"
 msgstr "Nueva Etiqueta"
 
-#: lib/cannery_web/components/topbar.ex:127
+#: lib/cannery_web/components/topbar.ex:130
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:28
 #: lib/cannery_web/templates/user_registration/new.html.heex:3
 #: lib/cannery_web/templates/user_registration/new.html.heex:37
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:44
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:42
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:28
-#: lib/cannery_web/templates/user_session/new.html.heex:41
+#: lib/cannery_web/templates/user_session/new.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr "Registrarse"
@@ -128,7 +128,7 @@ msgid "Resend confirmation instructions"
 msgstr "Reenviar instrucciones de confirmación"
 
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:3
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:31
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Reset password"
 msgstr "Resetear contraseña"
diff --git a/priv/gettext/es/LC_MESSAGES/default.po b/priv/gettext/es/LC_MESSAGES/default.po
index 4ce0e8d..fbabae7 100644
--- a/priv/gettext/es/LC_MESSAGES/default.po
+++ b/priv/gettext/es/LC_MESSAGES/default.po
@@ -195,7 +195,7 @@ msgstr "Solo Invitación"
 msgid "Invites"
 msgstr "Invitaciones"
 
-#: lib/cannery_web/templates/user_session/new.html.heex:25
+#: lib/cannery_web/templates/user_session/new.html.heex:23
 #, elixir-autogen, elixir-format
 msgid "Keep me logged in for 60 days"
 msgstr "Mantener registrado durante 60 días"
@@ -575,7 +575,7 @@ msgstr "Tipo de polvora"
 msgid "UPC"
 msgstr ""
 
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:22
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:20
 #: lib/cannery_web/templates/user_settings/edit.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "Confirm new password"
@@ -587,7 +587,7 @@ msgstr "Confirme contraseña nueva"
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:18
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
 #: lib/cannery_web/templates/user_settings/edit.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "New password"
@@ -1205,14 +1205,14 @@ msgstr ""
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:12
 #: lib/cannery_web/templates/user_registration/new.html.heex:20
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:12
-#: lib/cannery_web/templates/user_session/new.html.heex:19
+#: lib/cannery_web/templates/user_session/new.html.heex:17
 #: lib/cannery_web/templates/user_settings/edit.html.heex:27
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr ""
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:24
-#: lib/cannery_web/templates/user_session/new.html.heex:22
+#: lib/cannery_web/templates/user_session/new.html.heex:20
 #, elixir-autogen, elixir-format
 msgid "Password"
 msgstr ""
diff --git a/priv/gettext/es/LC_MESSAGES/emails.po b/priv/gettext/es/LC_MESSAGES/emails.po
index b42a5b9..99d9bb2 100644
--- a/priv/gettext/es/LC_MESSAGES/emails.po
+++ b/priv/gettext/es/LC_MESSAGES/emails.po
@@ -14,25 +14,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.14.2\n"
 
-## This file is a PO Template file.
-##
-## "msgid"s here are often extracted from source code.
-## Add new translations manually only if they're dynamic
-## translations that can't be statically extracted.
-##
-## Run "mix gettext.extract" to bring this file up to
-## date. Leave "msgstr"s empty as changing them here has no
-## effect: edit them in PO (.po) files instead.
-#: lib/cannery/accounts/email.ex:30
-#, elixir-autogen, elixir-format
-msgid "Confirm your %{name} account"
-msgstr "Confirma el %{name} de la cuenta"
-
-#: lib/cannery_web/templates/email/confirm_email.html.eex:3
+#: lib/cannery_web/templates/email/confirm_email.html.heex:3
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:2
-#: lib/cannery_web/templates/email/reset_password.html.eex:3
+#: lib/cannery_web/templates/email/reset_password.html.heex:3
 #: lib/cannery_web/templates/email/reset_password.txt.eex:2
-#: lib/cannery_web/templates/email/update_email.html.eex:3
+#: lib/cannery_web/templates/email/update_email.html.heex:3
 #: lib/cannery_web/templates/email/update_email.txt.eex:2
 #, elixir-autogen, elixir-format
 msgid "Hi %{email},"
@@ -49,27 +35,7 @@ msgstr "Si no creó un usuario en %{url}, por favor, ignore este mensaje."
 msgid "If you didn't request this change from %{url}, please ignore this."
 msgstr "Si no pidió este cambio desde %{url}, por favor, ignore este mensaje."
 
-#: lib/cannery/accounts/email.ex:37
-#, elixir-autogen, elixir-format
-msgid "Reset your %{name} password"
-msgstr "Reseteé su contraseña en %{name}"
-
-#: lib/cannery/accounts/email.ex:44
-#, elixir-autogen, elixir-format
-msgid "Update your %{name} email"
-msgstr "Actualice su correo en &{url}"
-
-#: lib/cannery_web/templates/email/confirm_email.html.eex:9
-#, elixir-autogen, elixir-format
-msgid "Welcome to %{name}!"
-msgstr "¡Bienvenide a %{name}!"
-
-#: lib/cannery_web/templates/email/confirm_email.txt.eex:4
-#, elixir-autogen, elixir-format
-msgid "Welcome to %{name}%!"
-msgstr "¡Bienvenide a %{name}%!"
-
-#: lib/cannery_web/templates/email/update_email.html.eex:8
+#: lib/cannery_web/templates/email/update_email.html.heex:8
 #: lib/cannery_web/templates/email/update_email.txt.eex:4
 #, elixir-autogen, elixir-format
 msgid "You can change your email by visiting the URL below:"
@@ -77,14 +43,14 @@ msgstr ""
 "Puede cambiar su correo electrónico visitando el enlace que se muestra a "
 "continuación:"
 
-#: lib/cannery_web/templates/email/confirm_email.html.eex:14
+#: lib/cannery_web/templates/email/confirm_email.html.heex:14
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:6
 #, elixir-autogen, elixir-format
 msgid "You can confirm your account by visiting the URL below:"
 msgstr ""
 "Puede confirmar su cuenta visitando el enlace que se muestra a continuación:"
 
-#: lib/cannery_web/templates/email/reset_password.html.eex:8
+#: lib/cannery_web/templates/email/reset_password.html.heex:8
 #: lib/cannery_web/templates/email/reset_password.txt.eex:4
 #, elixir-autogen, elixir-format
 msgid "You can reset your password by visiting the URL below:"
@@ -92,29 +58,59 @@ msgstr ""
 "Puede reestablecer su contraseña visitando el enlace que se muestra a "
 "continuación:"
 
-#: lib/cannery_web/templates/email/confirm_email.html.eex:22
-#, elixir-autogen, elixir-format
-msgid "If you didn't create an account at %{name}, please ignore this."
+## This file is a PO Template file.
+##
+## "msgid"s here are often extracted from source code.
+## Add new translations manually only if they're dynamic
+## translations that can't be statically extracted.
+##
+## Run "mix gettext.extract" to bring this file up to
+## date. Leave "msgstr"s empty as changing them here has no
+## effect: edit them in PO (.po) files instead.
+#: lib/cannery/accounts/email.ex:30
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Confirm your Cannery account"
+msgstr "Confirma el %{name} de la cuenta"
+
+#: lib/cannery_web/templates/email/confirm_email.html.heex:22
+#, elixir-autogen, elixir-format, fuzzy
+msgid "If you didn't create an account at Cannery, please ignore this."
 msgstr "Si no ha creado una cuenta en %{name}, por favor, ignore este mensaje."
 
-#: lib/cannery_web/templates/email/reset_password.html.eex:16
-#: lib/cannery_web/templates/email/update_email.html.eex:16
-#, elixir-autogen, elixir-format
-msgid "If you didn't request this change from %{name}, please ignore this."
+#: lib/cannery_web/templates/email/reset_password.html.heex:16
+#: lib/cannery_web/templates/email/update_email.html.heex:16
+#, elixir-autogen, elixir-format, fuzzy
+msgid "If you didn't request this change from Cannery, please ignore this."
 msgstr ""
 "Si no ha solicitado este cambio desde %{name}, por favor, ignore este "
 "mensaje."
 
+#: lib/cannery/accounts/email.ex:37
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Reset your Cannery password"
+msgstr "Reseteé su contraseña en %{name}"
+
 #: lib/cannery_web/templates/layout/email.txt.eex:9
-#, elixir-autogen, elixir-format
-msgid "This email was sent from %{name} at %{url}, the self-hosted firearm tracker website."
+#, elixir-autogen, elixir-format, fuzzy
+msgid "This email was sent from Cannery at %{url}, the self-hosted firearm tracker website."
 msgstr ""
 "Este correo se mandó por %{name} desde %{url}, la página de seguimiento de "
 "armas autogestionada."
 
 #: lib/cannery_web/templates/layout/email.html.heex:13
-#, elixir-autogen, elixir-format
-msgid "This email was sent from %{name}, the self-hosted firearm tracker website."
+#, elixir-autogen, elixir-format, fuzzy
+msgid "This email was sent from Cannery, the self-hosted firearm tracker website."
 msgstr ""
 "Este correo se mandó por %{name}, la página de seguimiento de armas "
 "autogestionada."
+
+#: lib/cannery/accounts/email.ex:44
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Update your Cannery email"
+msgstr "Actualice su correo en &{url}"
+
+#: lib/cannery_web/templates/email/confirm_email.html.heex:9
+#: lib/cannery_web/templates/email/confirm_email.txt.eex:4
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Welcome to Cannery"
+msgstr "¡Bienvenide a %{name}!"
diff --git a/priv/gettext/es/LC_MESSAGES/errors.po b/priv/gettext/es/LC_MESSAGES/errors.po
index fa0409d..b9f261b 100644
--- a/priv/gettext/es/LC_MESSAGES/errors.po
+++ b/priv/gettext/es/LC_MESSAGES/errors.po
@@ -70,7 +70,7 @@ msgid "Not found"
 msgstr "No se encontró"
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:13
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:14
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:13
 #: lib/cannery_web/templates/user_settings/edit.html.heex:22
 #: lib/cannery_web/templates/user_settings/edit.html.heex:64
 #: lib/cannery_web/templates/user_settings/edit.html.heex:118
diff --git a/priv/gettext/fr/LC_MESSAGES/actions.po b/priv/gettext/fr/LC_MESSAGES/actions.po
index b8e7ac6..6e90e09 100644
--- a/priv/gettext/fr/LC_MESSAGES/actions.po
+++ b/priv/gettext/fr/LC_MESSAGES/actions.po
@@ -69,7 +69,7 @@ msgstr "Supprimer utilisateur"
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:47
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:44
+#: lib/cannery_web/templates/user_session/new.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Forgot your password?"
 msgstr "Mot de passe oublié ?"
@@ -79,13 +79,13 @@ msgstr "Mot de passe oublié ?"
 msgid "Invite someone new!"
 msgstr "Invitez une nouvelle personne !"
 
-#: lib/cannery_web/components/topbar.ex:135
+#: lib/cannery_web/components/topbar.ex:138
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:31
 #: lib/cannery_web/templates/user_registration/new.html.heex:44
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:47
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:45
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:31
 #: lib/cannery_web/templates/user_session/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:30
+#: lib/cannery_web/templates/user_session/new.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr "Se connecter"
@@ -110,13 +110,13 @@ msgstr "Nouveau conteneur"
 msgid "New Tag"
 msgstr "Nouveau tag"
 
-#: lib/cannery_web/components/topbar.ex:127
+#: lib/cannery_web/components/topbar.ex:130
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:28
 #: lib/cannery_web/templates/user_registration/new.html.heex:3
 #: lib/cannery_web/templates/user_registration/new.html.heex:37
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:44
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:42
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:28
-#: lib/cannery_web/templates/user_session/new.html.heex:41
+#: lib/cannery_web/templates/user_session/new.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr "S’enregistrer"
@@ -128,7 +128,7 @@ msgid "Resend confirmation instructions"
 msgstr "Renvoyer les instructions de confirmation"
 
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:3
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:31
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Reset password"
 msgstr "Réinitialisé le mot de passe"
diff --git a/priv/gettext/fr/LC_MESSAGES/default.po b/priv/gettext/fr/LC_MESSAGES/default.po
index d5945ed..9611b27 100644
--- a/priv/gettext/fr/LC_MESSAGES/default.po
+++ b/priv/gettext/fr/LC_MESSAGES/default.po
@@ -195,7 +195,7 @@ msgstr "Uniquement sur invitation"
 msgid "Invites"
 msgstr "Invitations"
 
-#: lib/cannery_web/templates/user_session/new.html.heex:25
+#: lib/cannery_web/templates/user_session/new.html.heex:23
 #, elixir-autogen, elixir-format
 msgid "Keep me logged in for 60 days"
 msgstr "Me garder authentifié durant 60 jours"
@@ -576,7 +576,7 @@ msgstr "Type de poudre"
 msgid "UPC"
 msgstr "UPC"
 
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:22
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:20
 #: lib/cannery_web/templates/user_settings/edit.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "Confirm new password"
@@ -588,7 +588,7 @@ msgstr "Confirmez le nouveau mot de passe"
 msgid "Current password"
 msgstr "Mot de passe actuel"
 
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:18
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
 #: lib/cannery_web/templates/user_settings/edit.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "New password"
@@ -1206,14 +1206,14 @@ msgstr ""
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:12
 #: lib/cannery_web/templates/user_registration/new.html.heex:20
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:12
-#: lib/cannery_web/templates/user_session/new.html.heex:19
+#: lib/cannery_web/templates/user_session/new.html.heex:17
 #: lib/cannery_web/templates/user_settings/edit.html.heex:27
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr ""
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:24
-#: lib/cannery_web/templates/user_session/new.html.heex:22
+#: lib/cannery_web/templates/user_session/new.html.heex:20
 #, elixir-autogen, elixir-format
 msgid "Password"
 msgstr ""
diff --git a/priv/gettext/fr/LC_MESSAGES/emails.po b/priv/gettext/fr/LC_MESSAGES/emails.po
index 7a22332..0afcb2b 100644
--- a/priv/gettext/fr/LC_MESSAGES/emails.po
+++ b/priv/gettext/fr/LC_MESSAGES/emails.po
@@ -14,25 +14,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.11.2\n"
 
-## This file is a PO Template file.
-##
-## "msgid"s here are often extracted from source code.
-## Add new translations manually only if they're dynamic
-## translations that can't be statically extracted.
-##
-## Run "mix gettext.extract" to bring this file up to
-## date. Leave "msgstr"s empty as changing them here has no
-## effect: edit them in PO (.po) files instead.
-#: lib/cannery/accounts/email.ex:30
-#, elixir-autogen, elixir-format
-msgid "Confirm your %{name} account"
-msgstr "Confirmer votre compte %{name}"
-
-#: lib/cannery_web/templates/email/confirm_email.html.eex:3
+#: lib/cannery_web/templates/email/confirm_email.html.heex:3
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:2
-#: lib/cannery_web/templates/email/reset_password.html.eex:3
+#: lib/cannery_web/templates/email/reset_password.html.heex:3
 #: lib/cannery_web/templates/email/reset_password.txt.eex:2
-#: lib/cannery_web/templates/email/update_email.html.eex:3
+#: lib/cannery_web/templates/email/update_email.html.heex:3
 #: lib/cannery_web/templates/email/update_email.txt.eex:2
 #, elixir-autogen, elixir-format
 msgid "Hi %{email},"
@@ -51,66 +37,76 @@ msgstr ""
 "Si vous n’avez pas demandé ce changement depuis %{url}, veuillez ignorer "
 "ceci."
 
-#: lib/cannery/accounts/email.ex:37
-#, elixir-autogen, elixir-format
-msgid "Reset your %{name} password"
-msgstr "Réinitialiser votre mot de passe %{name}"
-
-#: lib/cannery/accounts/email.ex:44
-#, elixir-autogen, elixir-format
-msgid "Update your %{name} email"
-msgstr "Mettre à jour votre mél %{name}"
-
-#: lib/cannery_web/templates/email/confirm_email.html.eex:9
-#, elixir-autogen, elixir-format
-msgid "Welcome to %{name}!"
-msgstr "Bienvenue à %{name} !"
-
-#: lib/cannery_web/templates/email/confirm_email.txt.eex:4
-#, elixir-autogen, elixir-format
-msgid "Welcome to %{name}%!"
-msgstr "Bienvenue à %{name}% !"
-
-#: lib/cannery_web/templates/email/update_email.html.eex:8
+#: lib/cannery_web/templates/email/update_email.html.heex:8
 #: lib/cannery_web/templates/email/update_email.txt.eex:4
 #, elixir-autogen, elixir-format
 msgid "You can change your email by visiting the URL below:"
 msgstr "Vous pouvez changer votre mél en consultant l’URL ci-dessous :"
 
-#: lib/cannery_web/templates/email/confirm_email.html.eex:14
+#: lib/cannery_web/templates/email/confirm_email.html.heex:14
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:6
 #, elixir-autogen, elixir-format
 msgid "You can confirm your account by visiting the URL below:"
 msgstr "Vous pouvez confirmer votre compte en consultant l’URL ci-dessous :"
 
-#: lib/cannery_web/templates/email/reset_password.html.eex:8
+#: lib/cannery_web/templates/email/reset_password.html.heex:8
 #: lib/cannery_web/templates/email/reset_password.txt.eex:4
 #, elixir-autogen, elixir-format
 msgid "You can reset your password by visiting the URL below:"
 msgstr ""
 "Vous pouvez réinitialiser votre mot de passe en visitant l’URL ci-dessous :"
 
-#: lib/cannery_web/templates/email/confirm_email.html.eex:22
-#, elixir-autogen, elixir-format
-msgid "If you didn't create an account at %{name}, please ignore this."
+## This file is a PO Template file.
+##
+## "msgid"s here are often extracted from source code.
+## Add new translations manually only if they're dynamic
+## translations that can't be statically extracted.
+##
+## Run "mix gettext.extract" to bring this file up to
+## date. Leave "msgstr"s empty as changing them here has no
+## effect: edit them in PO (.po) files instead.
+#: lib/cannery/accounts/email.ex:30
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Confirm your Cannery account"
+msgstr "Confirmer votre compte %{name}"
+
+#: lib/cannery_web/templates/email/confirm_email.html.heex:22
+#, elixir-autogen, elixir-format, fuzzy
+msgid "If you didn't create an account at Cannery, please ignore this."
 msgstr "Si vous n’avez pas créé de compte à %{name}, veuillez ignorer ceci."
 
-#: lib/cannery_web/templates/email/reset_password.html.eex:16
-#: lib/cannery_web/templates/email/update_email.html.eex:16
-#, elixir-autogen, elixir-format
-msgid "If you didn't request this change from %{name}, please ignore this."
+#: lib/cannery_web/templates/email/reset_password.html.heex:16
+#: lib/cannery_web/templates/email/update_email.html.heex:16
+#, elixir-autogen, elixir-format, fuzzy
+msgid "If you didn't request this change from Cannery, please ignore this."
 msgstr ""
 "Si vous n’avez pas demandé ce changement depuis %{name}, veuillez ignorer "
 "ceci."
 
+#: lib/cannery/accounts/email.ex:37
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Reset your Cannery password"
+msgstr "Réinitialiser votre mot de passe %{name}"
+
 #: lib/cannery_web/templates/layout/email.txt.eex:9
-#, elixir-autogen, elixir-format
-msgid "This email was sent from %{name} at %{url}, the self-hosted firearm tracker website."
+#, elixir-autogen, elixir-format, fuzzy
+msgid "This email was sent from Cannery at %{url}, the self-hosted firearm tracker website."
 msgstr ""
 "Ce mél a été envoyé depuis %{name} à %{url}, le site web de suivi d’arme à "
 "feux."
 
 #: lib/cannery_web/templates/layout/email.html.heex:13
-#, elixir-autogen, elixir-format
-msgid "This email was sent from %{name}, the self-hosted firearm tracker website."
+#, elixir-autogen, elixir-format, fuzzy
+msgid "This email was sent from Cannery, the self-hosted firearm tracker website."
 msgstr "Ce mél a été envoyé depuis %{name}, le site web de suivi d’arme à feu."
+
+#: lib/cannery/accounts/email.ex:44
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Update your Cannery email"
+msgstr "Mettre à jour votre mél %{name}"
+
+#: lib/cannery_web/templates/email/confirm_email.html.heex:9
+#: lib/cannery_web/templates/email/confirm_email.txt.eex:4
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Welcome to Cannery"
+msgstr "Bienvenue à %{name} !"
diff --git a/priv/gettext/fr/LC_MESSAGES/errors.po b/priv/gettext/fr/LC_MESSAGES/errors.po
index 1f1ccf7..b556329 100644
--- a/priv/gettext/fr/LC_MESSAGES/errors.po
+++ b/priv/gettext/fr/LC_MESSAGES/errors.po
@@ -70,7 +70,7 @@ msgid "Not found"
 msgstr "Pas trouvé"
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:13
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:14
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:13
 #: lib/cannery_web/templates/user_settings/edit.html.heex:22
 #: lib/cannery_web/templates/user_settings/edit.html.heex:64
 #: lib/cannery_web/templates/user_settings/edit.html.heex:118
diff --git a/priv/gettext/ga/LC_MESSAGES/actions.po b/priv/gettext/ga/LC_MESSAGES/actions.po
index ef37a53..ae31283 100644
--- a/priv/gettext/ga/LC_MESSAGES/actions.po
+++ b/priv/gettext/ga/LC_MESSAGES/actions.po
@@ -67,7 +67,7 @@ msgstr ""
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:47
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:44
+#: lib/cannery_web/templates/user_session/new.html.heex:42
 #, elixir-autogen, elixir-format
 msgid "Forgot your password?"
 msgstr ""
@@ -77,13 +77,13 @@ msgstr ""
 msgid "Invite someone new!"
 msgstr ""
 
-#: lib/cannery_web/components/topbar.ex:135
+#: lib/cannery_web/components/topbar.ex:138
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:31
 #: lib/cannery_web/templates/user_registration/new.html.heex:44
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:47
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:45
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:31
 #: lib/cannery_web/templates/user_session/new.html.heex:3
-#: lib/cannery_web/templates/user_session/new.html.heex:30
+#: lib/cannery_web/templates/user_session/new.html.heex:28
 #, elixir-autogen, elixir-format
 msgid "Log in"
 msgstr ""
@@ -108,13 +108,13 @@ msgstr ""
 msgid "New Tag"
 msgstr ""
 
-#: lib/cannery_web/components/topbar.ex:127
+#: lib/cannery_web/components/topbar.ex:130
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:28
 #: lib/cannery_web/templates/user_registration/new.html.heex:3
 #: lib/cannery_web/templates/user_registration/new.html.heex:37
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:44
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:42
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:28
-#: lib/cannery_web/templates/user_session/new.html.heex:41
+#: lib/cannery_web/templates/user_session/new.html.heex:39
 #, elixir-autogen, elixir-format
 msgid "Register"
 msgstr ""
@@ -126,7 +126,7 @@ msgid "Resend confirmation instructions"
 msgstr ""
 
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:3
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:31
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:29
 #, elixir-autogen, elixir-format
 msgid "Reset password"
 msgstr ""
diff --git a/priv/gettext/ga/LC_MESSAGES/default.po b/priv/gettext/ga/LC_MESSAGES/default.po
index b7ca49d..ed92168 100644
--- a/priv/gettext/ga/LC_MESSAGES/default.po
+++ b/priv/gettext/ga/LC_MESSAGES/default.po
@@ -193,7 +193,7 @@ msgstr ""
 msgid "Invites"
 msgstr ""
 
-#: lib/cannery_web/templates/user_session/new.html.heex:25
+#: lib/cannery_web/templates/user_session/new.html.heex:23
 #, elixir-autogen, elixir-format
 msgid "Keep me logged in for 60 days"
 msgstr ""
@@ -570,7 +570,7 @@ msgstr ""
 msgid "UPC"
 msgstr ""
 
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:22
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:20
 #: lib/cannery_web/templates/user_settings/edit.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "Confirm new password"
@@ -582,7 +582,7 @@ msgstr ""
 msgid "Current password"
 msgstr ""
 
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:18
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
 #: lib/cannery_web/templates/user_settings/edit.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "New password"
@@ -1197,14 +1197,14 @@ msgstr ""
 #: lib/cannery_web/templates/user_confirmation/new.html.heex:12
 #: lib/cannery_web/templates/user_registration/new.html.heex:20
 #: lib/cannery_web/templates/user_reset_password/new.html.heex:12
-#: lib/cannery_web/templates/user_session/new.html.heex:19
+#: lib/cannery_web/templates/user_session/new.html.heex:17
 #: lib/cannery_web/templates/user_settings/edit.html.heex:27
 #, elixir-autogen, elixir-format
 msgid "Email"
 msgstr ""
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:24
-#: lib/cannery_web/templates/user_session/new.html.heex:22
+#: lib/cannery_web/templates/user_session/new.html.heex:20
 #, elixir-autogen, elixir-format
 msgid "Password"
 msgstr ""
diff --git a/priv/gettext/ga/LC_MESSAGES/emails.po b/priv/gettext/ga/LC_MESSAGES/emails.po
index 995c8eb..3eab88f 100644
--- a/priv/gettext/ga/LC_MESSAGES/emails.po
+++ b/priv/gettext/ga/LC_MESSAGES/emails.po
@@ -12,25 +12,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 3.7.3\n"
 
-## This file is a PO Template file.
-##
-## "msgid"s here are often extracted from source code.
-## Add new translations manually only if they're dynamic
-## translations that can't be statically extracted.
-##
-## Run "mix gettext.extract" to bring this file up to
-## date. Leave "msgstr"s empty as changing them here has no
-## effect: edit them in PO (.po) files instead.
-#: lib/cannery/accounts/email.ex:30
-#, elixir-autogen, elixir-format
-msgid "Confirm your %{name} account"
-msgstr ""
-
-#: lib/cannery_web/templates/email/confirm_email.html.eex:3
+#: lib/cannery_web/templates/email/confirm_email.html.heex:3
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:2
-#: lib/cannery_web/templates/email/reset_password.html.eex:3
+#: lib/cannery_web/templates/email/reset_password.html.heex:3
 #: lib/cannery_web/templates/email/reset_password.txt.eex:2
-#: lib/cannery_web/templates/email/update_email.html.eex:3
+#: lib/cannery_web/templates/email/update_email.html.heex:3
 #: lib/cannery_web/templates/email/update_email.txt.eex:2
 #, elixir-autogen, elixir-format
 msgid "Hi %{email},"
@@ -47,61 +33,71 @@ msgstr ""
 msgid "If you didn't request this change from %{url}, please ignore this."
 msgstr ""
 
-#: lib/cannery/accounts/email.ex:37
-#, elixir-autogen, elixir-format
-msgid "Reset your %{name} password"
-msgstr ""
-
-#: lib/cannery/accounts/email.ex:44
-#, elixir-autogen, elixir-format
-msgid "Update your %{name} email"
-msgstr ""
-
-#: lib/cannery_web/templates/email/confirm_email.html.eex:9
-#, elixir-autogen, elixir-format
-msgid "Welcome to %{name}!"
-msgstr ""
-
-#: lib/cannery_web/templates/email/confirm_email.txt.eex:4
-#, elixir-autogen, elixir-format
-msgid "Welcome to %{name}%!"
-msgstr ""
-
-#: lib/cannery_web/templates/email/update_email.html.eex:8
+#: lib/cannery_web/templates/email/update_email.html.heex:8
 #: lib/cannery_web/templates/email/update_email.txt.eex:4
 #, elixir-autogen, elixir-format
 msgid "You can change your email by visiting the URL below:"
 msgstr ""
 
-#: lib/cannery_web/templates/email/confirm_email.html.eex:14
+#: lib/cannery_web/templates/email/confirm_email.html.heex:14
 #: lib/cannery_web/templates/email/confirm_email.txt.eex:6
 #, elixir-autogen, elixir-format
 msgid "You can confirm your account by visiting the URL below:"
 msgstr ""
 
-#: lib/cannery_web/templates/email/reset_password.html.eex:8
+#: lib/cannery_web/templates/email/reset_password.html.heex:8
 #: lib/cannery_web/templates/email/reset_password.txt.eex:4
 #, elixir-autogen, elixir-format
 msgid "You can reset your password by visiting the URL below:"
 msgstr ""
 
-#: lib/cannery_web/templates/email/confirm_email.html.eex:22
-#, elixir-autogen, elixir-format
-msgid "If you didn't create an account at %{name}, please ignore this."
+## This file is a PO Template file.
+##
+## "msgid"s here are often extracted from source code.
+## Add new translations manually only if they're dynamic
+## translations that can't be statically extracted.
+##
+## Run "mix gettext.extract" to bring this file up to
+## date. Leave "msgstr"s empty as changing them here has no
+## effect: edit them in PO (.po) files instead.
+#: lib/cannery/accounts/email.ex:30
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Confirm your Cannery account"
 msgstr ""
 
-#: lib/cannery_web/templates/email/reset_password.html.eex:16
-#: lib/cannery_web/templates/email/update_email.html.eex:16
-#, elixir-autogen, elixir-format
-msgid "If you didn't request this change from %{name}, please ignore this."
+#: lib/cannery_web/templates/email/confirm_email.html.heex:22
+#, elixir-autogen, elixir-format, fuzzy
+msgid "If you didn't create an account at Cannery, please ignore this."
+msgstr ""
+
+#: lib/cannery_web/templates/email/reset_password.html.heex:16
+#: lib/cannery_web/templates/email/update_email.html.heex:16
+#, elixir-autogen, elixir-format, fuzzy
+msgid "If you didn't request this change from Cannery, please ignore this."
+msgstr ""
+
+#: lib/cannery/accounts/email.ex:37
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Reset your Cannery password"
 msgstr ""
 
 #: lib/cannery_web/templates/layout/email.txt.eex:9
-#, elixir-autogen, elixir-format
-msgid "This email was sent from %{name} at %{url}, the self-hosted firearm tracker website."
+#, elixir-autogen, elixir-format, fuzzy
+msgid "This email was sent from Cannery at %{url}, the self-hosted firearm tracker website."
 msgstr ""
 
 #: lib/cannery_web/templates/layout/email.html.heex:13
-#, elixir-autogen, elixir-format
-msgid "This email was sent from %{name}, the self-hosted firearm tracker website."
+#, elixir-autogen, elixir-format, fuzzy
+msgid "This email was sent from Cannery, the self-hosted firearm tracker website."
+msgstr ""
+
+#: lib/cannery/accounts/email.ex:44
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Update your Cannery email"
+msgstr ""
+
+#: lib/cannery_web/templates/email/confirm_email.html.heex:9
+#: lib/cannery_web/templates/email/confirm_email.txt.eex:4
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Welcome to Cannery"
 msgstr ""
diff --git a/priv/gettext/ga/LC_MESSAGES/errors.po b/priv/gettext/ga/LC_MESSAGES/errors.po
index 934f168..1d9f660 100644
--- a/priv/gettext/ga/LC_MESSAGES/errors.po
+++ b/priv/gettext/ga/LC_MESSAGES/errors.po
@@ -71,7 +71,7 @@ msgid "Not found"
 msgstr "Ní feidir é a fáil"
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:13
-#: lib/cannery_web/templates/user_reset_password/edit.html.heex:14
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:13
 #: lib/cannery_web/templates/user_settings/edit.html.heex:22
 #: lib/cannery_web/templates/user_settings/edit.html.heex:64
 #: lib/cannery_web/templates/user_settings/edit.html.heex:118
diff --git a/test/cannery_web/controllers/user_auth_test.exs b/test/cannery_web/controllers/user_auth_test.exs
index 98e7bcb..3290320 100644
--- a/test/cannery_web/controllers/user_auth_test.exs
+++ b/test/cannery_web/controllers/user_auth_test.exs
@@ -116,7 +116,7 @@ defmodule CanneryWeb.UserAuthTest do
     end
 
     test "does not authenticate if data is missing", %{conn: conn, current_user: current_user} do
-      _token = Accounts.generate_user_session_token(current_user)
+      _session_token = Accounts.generate_user_session_token(current_user)
       conn = UserAuth.fetch_current_user(conn, [])
       refute get_session(conn, :user_token)
       refute conn.assigns.current_user