         (spacer 24))
       (h1 intro)
       (spacer 8)
-      (h2 (:headline post-data) entry-url)
+      (h2 (:headline post-data) final-url)
       (spacer 24)
       (spacer 24 "note-paragraph top-note-paragraph" "note-paragraph top-note-paragraph")
       (paragraph notification-html-content "note-paragraph note-left-padding" "text-left" "note-x-margin")
       (spacer 24 "note-paragraph bottom-note-paragraph" "note-paragraph bottom-note-paragraph")
       (spacer 24)
-      (left-button button-cta entry-url)
+      (left-button button-cta final-url)
       (spacer 40)]))
 
 (defn- notify-team-content [msg]

                      :avatar-url (:avatar-url msg)
                      :team-id (:team-id org)} ;; Let's read the team-id from the org to avoid problems on multiple org users
        id-token (jwt/generate-id-token token-claims config/passphrase)
        base-url (if (seq interaction-id)
                   (s/join "/" [origin-url org-slug board-slug "post" uuid "comment" interaction-id])
                   (s/join "/" [origin-url org-slug board-slug "post" uuid]))
        entry-url (str base-url "?id=" id-token)
        button-cta (if (or (not mention?) interaction-id)
                    "view_comment"
                    "view_post")

  (let [notification (:notification msg)
        content (:content notification)
        org (:org msg)
        board (:board msg)
        entry-data (:entry-data notification)
        org-slug (:slug org)
        org-uuid (or (:uuid org) (:org-uuid entry-data) (:org-id notification))
        org-url-part (or org-slug org-uuid)
        board-slug (or (:board-slug entry-data) (:slug board))
        board-uuid (or (:board-uuid entry-data) (:uuid board) (:board-id notification))
        board-url-part (or board-slug board-uuid)
        mention? (:mention notification)
        interaction-id (:interaction-id notification)
        first-name (:first-name msg)
