diff --git a/mastodon/models/email.py b/mastodon/models/email.py
index 3e4e029a..19bc753b 100644
--- a/mastodon/models/email.py
+++ b/mastodon/models/email.py
@@ -46,7 +46,7 @@ class Email:
     def generate_login_email(email: str, action: str) -> tuple[str, str]:
         if action != "verify":
             account = EmailAccount.objects.filter(handle__iexact=email).first()
-            action = "register" if account and account.user else "login"
+            action = "login" if account and account.user else "register"
         s = {"e": email, "a": action}
         # v = TimestampSigner().sign_object(s)
         code = b62_encode(random.randint(pow(62, 4), pow(62, 5) - 1))
diff --git a/social/templates/feed_events.html b/social/templates/feed_events.html
index b59b4dcb..b446a7be 100644
--- a/social/templates/feed_events.html
+++ b/social/templates/feed_events.html
@@ -27,7 +27,8 @@
           <div>
             <div class="avatar" style="margin:0.6em 0.6em 0.6em 0;">
               <a href="{{ post.author.url }}">
-                <img src="{{ post.author.icon_uri }}" alt="@{{ post.author.handle }}">
+                <img src="{{ post.author.local_icon_url }}"
+                     alt="@{{ post.author.handle }}">
               </a>
             </div>
           </div>