diff --git a/docs/topics/Disclaimers.adoc b/docs/topics/Disclaimers.adoc
index a8e9be57c..419778ace 100644
--- a/docs/topics/Disclaimers.adoc
+++ b/docs/topics/Disclaimers.adoc
@@ -21,12 +21,3 @@ Special, incidental or consequential damages arising out of the use or inability
 Limited to loss of data or data being rendered inaccurate or losses sustained by you or third parties or a failure of
 The program to operate with any other programs), even if such holder or other party has been advised of the possibility
 Of such damages.
-
-== Contact Us
-
-We are committed to continually improve KeePassXC through customer experience and your feedback is important to us.
-Please send us your feedback or comments to team@keepassxc.org.
-To report issues, visit: https://github.com/keepassxreboot/keepassxc.
-
-Thank You, +
-Team KeePassXC
diff --git a/docs/topics/Welcome.adoc b/docs/topics/Welcome.adoc
index ec44b6e53..b10b04f3d 100644
--- a/docs/topics/Welcome.adoc
+++ b/docs/topics/Welcome.adoc
@@ -43,6 +43,18 @@ KeePassXC has numerous features for novice and power users alike. This guide wil
  ** SSH Agent
  ** FreeDesktop.org Secret Service (replace Gnome keyring, etc.)
  ** Additional encryption choices: Twofish and ChaCha20
+
+== Contact Us
+
+We are committed to continually improve KeePassXC through customer experience and your feedback is important to us.
+Please report any bugs you encounter at our https://github.com/keepassxreboot/keepassxc/issues[GitHub issue tracker].
+
+We are also https://matrix.to/#/#keepassxc-community:mozilla.org[available on Matrix] for real-time feedback and
+discussions. See our https://keepassxc.org/team/#contact[contact page] for further options.
+
+Thank You, +
+Team KeePassXC
+
 // end::content[]
 // tag::advanced[]
 // end::advanced[]