diff --git a/src/pkmntrade_club/theme/templates/account/confirm_email_verification_code.html b/src/pkmntrade_club/theme/templates/account/confirm_email_verification_code.html
index b40fc02..5b6efd5 100644
--- a/src/pkmntrade_club/theme/templates/account/confirm_email_verification_code.html
+++ b/src/pkmntrade_club/theme/templates/account/confirm_email_verification_code.html
@@ -15,7 +15,7 @@
     {% csrf_token %}
     {{ form.non_field_errors }}
     <div>
-      <label for="{{ form.code.id_for_label }}" class="block font-medium>{% trans "Verification Code" %}</label>
+      <label for="{{ form.code.id_for_label }}" class="block font-medium">{% trans "Verification Code" %}</label>
       {{ form.code }}
       {{ form.code.errors }}
     </div>
diff --git a/src/pkmntrade_club/theme/templates/account/confirm_login_code.html b/src/pkmntrade_club/theme/templates/account/confirm_login_code.html
index 0a85c99..b5f8225 100644
--- a/src/pkmntrade_club/theme/templates/account/confirm_login_code.html
+++ b/src/pkmntrade_club/theme/templates/account/confirm_login_code.html
@@ -19,11 +19,24 @@
     {% csrf_token %}
     {{ form.non_field_errors }}
     <div>
-      <label for="{{ form.code.id_for_label }}" class="block font-medium>{% trans "Sign-In Code" %}</label>
+      <label for="{{ form.code.id_for_label }}" class="block font-medium">{% trans "Sign-In Code" %}</label>
       {{ form.code }}
       {{ form.code.errors }}
     </div>
     <button type="submit" class="btn btn-primary w-full">{% trans "Confirm" %}</button>
   </form>
 </div>
+
+<script>
+  document.addEventListener('DOMContentLoaded', function() {
+    const urlParams = new URLSearchParams(window.location.search);
+    const code = urlParams.get('code');
+    if (code) {
+      const codeInput = document.getElementById('{{ form.code.id_for_label }}');
+      if (codeInput) {
+        codeInput.value = code;
+      }
+    }
+  });
+</script>
 {% endblock content %}
diff --git a/src/pkmntrade_club/theme/templates/account/confirm_password_reset_code.html b/src/pkmntrade_club/theme/templates/account/confirm_password_reset_code.html
index d67011a..410f87c 100644
--- a/src/pkmntrade_club/theme/templates/account/confirm_password_reset_code.html
+++ b/src/pkmntrade_club/theme/templates/account/confirm_password_reset_code.html
@@ -15,7 +15,7 @@
     {% csrf_token %}
     {{ form.non_field_errors }}
     <div>
-      <label for="{{ form.code.id_for_label }}" class="block font-medium>{% trans "Reset Code" %}</label>
+      <label for="{{ form.code.id_for_label }}" class="block font-medium">{% trans "Reset Code" %}</label>
       {{ form.code }}
       {{ form.code.errors }}
     </div>
diff --git a/src/pkmntrade_club/theme/templates/account/confirm_phone_verification_code.html b/src/pkmntrade_club/theme/templates/account/confirm_phone_verification_code.html
index 9463853..49a4e01 100644
--- a/src/pkmntrade_club/theme/templates/account/confirm_phone_verification_code.html
+++ b/src/pkmntrade_club/theme/templates/account/confirm_phone_verification_code.html
@@ -15,7 +15,7 @@
     {% csrf_token %}
     {{ form.non_field_errors }}
     <div>
-      <label for="{{ form.code.id_for_label }}" class="block font-medium>{% trans "Verification Code" %}</label>
+      <label for="{{ form.code.id_for_label }}" class="block font-medium">{% trans "Verification Code" %}</label>
       {{ form.code }}
       {{ form.code.errors }}
     </div>
diff --git a/src/pkmntrade_club/theme/templates/account/email.html b/src/pkmntrade_club/theme/templates/account/email.html
index 2420be9..9e99e40 100644
--- a/src/pkmntrade_club/theme/templates/account/email.html
+++ b/src/pkmntrade_club/theme/templates/account/email.html
@@ -46,7 +46,7 @@
     <form method="post" action="{{ action_url }}" class="space-y-4">
       {% csrf_token %}
       <div>
-        <label for="{{ form.email.id_for_label }}" class="block font-medium>{{ form.email.label }}</label>
+        <label for="{{ form.email.id_for_label }}" class="block font-medium">{{ form.email.label }}</label>
         {{ form.email }}
         {{ form.email.errors }}
       </div>
diff --git a/src/pkmntrade_club/theme/templates/account/email/login_code_message.txt b/src/pkmntrade_club/theme/templates/account/email/login_code_message.txt
index 6e98aae..911a8c0 100644
--- a/src/pkmntrade_club/theme/templates/account/email/login_code_message.txt
+++ b/src/pkmntrade_club/theme/templates/account/email/login_code_message.txt
@@ -2,8 +2,10 @@
 {% load account %}
 {% load i18n %}
 
-{% block content %}{% autoescape off %}{% blocktranslate %}Your sign-in code is listed below. Please enter it in your open browser window.{% endblocktranslate %}{% endautoescape %}
+{% block content %}{% autoescape off %}{% blocktranslate %}Your login code is listed below. Please enter it in your open browser window or click the link below.{% endblocktranslate %}{% endautoescape %}
 
 {{ code }}
 
-{% blocktranslate %}This mail can be safely ignored if you did not initiate this action.{% endblocktranslate %}{% endblock content %}
+https://{{ current_site.domain }}/accounts/login/code/confirm/?code={{ code }}
+
+{% blocktranslate %}This email can be safely ignored if you did not initiate this action.{% endblocktranslate %}{% endblock content %}
diff --git a/src/pkmntrade_club/theme/templates/account/email_change.html b/src/pkmntrade_club/theme/templates/account/email_change.html
index c023d1c..78ed369 100644
--- a/src/pkmntrade_club/theme/templates/account/email_change.html
+++ b/src/pkmntrade_club/theme/templates/account/email_change.html
@@ -15,13 +15,13 @@
     {% csrf_token %}
     {% if current_emailaddress %}
       <div>
-        <label for="current_email" class="block font-medium>{% trans "Current email" %}:</label>
+        <label for="current_email" class="block font-medium">{% trans "Current email" %}:</label>
         <input id="current_email" type="email" value="{{ current_emailaddress.email }}" disabled class="input input-bordered w-full">
       </div>
     {% endif %}
     {% if new_emailaddress %}
       <div>
-        <label for="new_email" class="block font-medium>
+        <label for="new_email" class="block font-medium">
           {% if not current_emailaddress %}
             {% trans "Current email" %}:
           {% else %}
@@ -41,7 +41,7 @@
       </div>
     {% endif %}
     <div>
-      <label for="{{ form.email.id_for_label }}" class="block font-medium>{% trans "Change to" %}:</label>
+      <label for="{{ form.email.id_for_label }}" class="block font-medium">{% trans "Change to" %}:</label>
       {{ form.email }}
       {{ form.email.errors }}
     </div>
diff --git a/src/pkmntrade_club/theme/templates/account/password_reset.html b/src/pkmntrade_club/theme/templates/account/password_reset.html
index e86b449..90286fe 100644
--- a/src/pkmntrade_club/theme/templates/account/password_reset.html
+++ b/src/pkmntrade_club/theme/templates/account/password_reset.html
@@ -11,7 +11,7 @@
     {% csrf_token %}
     {{ form.non_field_errors }}
     <div>
-      <label for="{{ form.email.id_for_label }}" class="block font-medium>{{ form.email.label }}</label>
+      <label for="{{ form.email.id_for_label }}" class="block font-medium">{{ form.email.label }}</label>
       {{ form.email|add_class:"input input-bordered w-full" }}
       {{ form.email.errors }}
     </div>
diff --git a/src/pkmntrade_club/theme/templates/account/reauthenticate.html b/src/pkmntrade_club/theme/templates/account/reauthenticate.html
index c68fe46..b948c3b 100644
--- a/src/pkmntrade_club/theme/templates/account/reauthenticate.html
+++ b/src/pkmntrade_club/theme/templates/account/reauthenticate.html
@@ -12,7 +12,7 @@
     {{ form.non_field_errors }}
     {% for field in form %}
       <div>
-        <label for="{{ field.id_for_label }}" class="block font-medium>{{ field.label }}</label>
+        <label for="{{ field.id_for_label }}" class="block font-medium">{{ field.label }}</label>
         {{ field }}
         {{ field.errors }}
       </div>
diff --git a/src/pkmntrade_club/theme/templates/account/request_login_code.html b/src/pkmntrade_club/theme/templates/account/request_login_code.html
index bef2dfd..d1f99b3 100644
--- a/src/pkmntrade_club/theme/templates/account/request_login_code.html
+++ b/src/pkmntrade_club/theme/templates/account/request_login_code.html
@@ -16,17 +16,17 @@
     {{ form.non_field_errors }}
     {% for field in form %}
       <div>
-        <label for="{{ field.id_for_label }}" class="block font-medium>{{ field.label }}</label>
+        <label for="{{ field.id_for_label }}" class="block font-medium">{{ field.label }}</label>
         {{ field }}
         {{ field.errors }}
       </div>
     {% endfor %}
     {{ redirect_field }}
-    <button type="submit" class="btn btn-primary w-full">{% trans "Request Code" %}</button>
+    <button type="submit" class="btn btn-primary w-full">{% trans "Request Sign-In Code" %}</button>
   </form>
   {% url 'account_login' as login_url %}
   <div class="mt-4 text-center">
-    <a href="{{ login_url }}" class="text-primary underline">{% trans "Other sign-in options" %}</a>
+    <a href="{{ login_url }}" class="text-primary underline">{% trans "Login by Password" %}</a>
   </div>
 </div>
 {% endblock content %}
diff --git a/src/pkmntrade_club/theme/templates/account/signup_by_passkey.html b/src/pkmntrade_club/theme/templates/account/signup_by_passkey.html
index f30801c..4e5f09e 100644
--- a/src/pkmntrade_club/theme/templates/account/signup_by_passkey.html
+++ b/src/pkmntrade_club/theme/templates/account/signup_by_passkey.html
@@ -17,7 +17,7 @@
     {{ form.non_field_errors }}
     {% for field in form %}
       <div>
-        <label for="{{ field.id_for_label }}" class="block font-medium>{{ field.label }}</label>
+        <label for="{{ field.id_for_label }}" class="block font-medium">{{ field.label }}</label>
         {{ field }}
         {{ field.errors }}
       </div>
diff --git a/src/pkmntrade_club/theme/templates/account/signup_closed.html b/src/pkmntrade_club/theme/templates/account/signup_closed.html
index bf7e8c6..e177b51 100644
--- a/src/pkmntrade_club/theme/templates/account/signup_closed.html
+++ b/src/pkmntrade_club/theme/templates/account/signup_closed.html
@@ -8,7 +8,7 @@
 <div class="container mx-auto max-w-md mt-6 text-center">
   <h1 class="text-3xl font-bold mb-6">{% trans "Sign Up Closed" %}</h1>
   <p>
-    {% trans "We are sorry, but the sign up is currently closed." %}
+    {% trans "We're sorry, but sign ups are currently closed." %}
   </p>
 </div>
 {% endblock content %}