diff --git a/CHANGES.md b/CHANGES.md
index e0e06af339..dea2dda88a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@
 - #3824: Dates and times are not translated 
 - #3829: Rich text from LibreOffice Calc is sent as screenshots
 - #3830: The message textarea blocks undo of the pasted text
+- #3852: Share XMPP address with web link on https://xmpp.link
 - #3863: Shift `unescapeHTML` helper function (used to set `isOnlyEmoji` on a message) to converse-headless
 - #3889: MUC join: Use room jids localpart as name in case name or identity not found
 - #3916: Add support for XEP-0461 Message Replies, allowing users to reply to specific messages
diff --git a/src/plugins/muc-views/modals/templates/muc-details.js b/src/plugins/muc-views/modals/templates/muc-details.js
index ae51506d24..ddb68aead9 100644
--- a/src/plugins/muc-views/modals/templates/muc-details.js
+++ b/src/plugins/muc-views/modals/templates/muc-details.js
@@ -66,7 +66,7 @@ export default (model) => {
                 height="72" width="72"></converse-avatar>
 
             <p class="room-info"><strong>${i18n_name}:</strong> ${model.get('name')}</p>
-            <p class="room-info"><strong>${i18n_address}:</strong> <converse-texture text="xmpp:${model.get('jid')}?join"></converse-texture></p>
+            <p class="room-info"><strong>${i18n_address}:</strong> <converse-texture text="xmpp:${model.get('jid')}?join"></converse-texture> <a href="https://xmpp.link/#${model.get('jid')}?join">web</a></p>
             <br/>
             <p class="room-info"><strong>${i18n_desc}:</strong> <converse-texture text="${config.description}" render_styling></converse-texture></p>
             ${ (model.get('subject')) ? subject(model) : '' }
diff --git a/src/plugins/profile/templates/profile_modal.js b/src/plugins/profile/templates/profile_modal.js
index fc84842722..d5e95c509c 100644
--- a/src/plugins/profile/templates/profile_modal.js
+++ b/src/plugins/profile/templates/profile_modal.js
@@ -145,7 +145,7 @@ export default (el) => {
                         <div class="col">
                             <div class="px-3">
                                 <label class="col-form-label">${i18n_jid}:</label>
-                                <div>${o.jid}</div>
+                                <div><a href="xmpp:${o.jid}">${o.jid}</a> <a href="https://xmpp.link/#${o.jid}">web</a></div>
                             </div>
                         </div>
                     </div>
diff --git a/src/shared/modals/templates/user-details.js b/src/shared/modals/templates/user-details.js
index 1972bdc563..2ef1dbe89f 100644
--- a/src/shared/modals/templates/user-details.js
+++ b/src/shared/modals/templates/user-details.js
@@ -233,7 +233,7 @@ export function tplUserDetailsModal(el) {
                     : ''}
                 <div class="row mb-2">
                     <div class="col-sm-4"><label>${i18n_address}:</label></div>
-                    <div class="col-sm-8"><a href="xmpp:${o.jid}">${o.jid}</a></div>
+                    <div class="col-sm-8"><a href="xmpp:${o.jid}">${o.jid}</a> <a href="https://xmpp.link/#${o.jid}">web</a></div>
                 </div>
 
                 ${contact