         notification-author (:author notification)
         notification-author-name (:name notification-author)
         notification-author-url (fix-avatar-url (:avatar-url notification-author))
-        uuid (:uuid content)
+        uuid (:entry-id notification)
+        secure-uuid (:secure-uuid notification)
         origin-url config/web-url
         token-claims {:org-id (:org-id notification)
                       :secure-uuid secure-uuid

      (spacer 64)
      (h1 intro)
      (spacer 24)
      (post-block (:entry-data notification) entry-url)
      (spacer 24)
      (spacer 24 "note-paragraph top-note-paragraph" "note-paragraph top-note-paragraph")
      (note-author notification-author-name notification-author-url)

  (let [notification (:notification msg)
        content (:content notification)
        org (:org msg)
        entry-data (:entry-data notification)
        board-slug (:board-slug entry-data)
        logo-url (:logo-url org)
        logo? (not (s/blank? logo-url))
        org-name (:name org)
