diff --git a/README.md b/README.md
index 5265ca66..a4ddc7e6 100644
--- a/README.md
+++ b/README.md
@@ -48,13 +48,10 @@
   <a rel="me" href="https://social.tchncs.de/@invidious">
   <img alt="Mastodon: @invidious@social.tchncs.de" src="https://img.shields.io/badge/Mastodon-%40invidious%40social.tchncs.de-darkgreen">
   </a>
-  
-  <h5>E-mail us:</h5>
-  <ul>
-  <li>General Inquiries (forwarded to every team member): <code>contact [at] invidious [dot] io</code> (Note: before sending a bug report please check that it hasn't already be reported on GitHub - bug reports sent to this address will be copied to GitHub)</li>
-  <li>Security issues (forwarded to the two project owners, <a href="https://github.com/TheFrenchGhosty">@TheFrenchGhosty</a> and <a href="https://github.com/Perflyst">@Perflyst</a>): <code>security [at] invidious [dot] io</code></li>
-  </ul>
-    
+  <br>
+  <a href="#contact">
+  <img alt="Contact the team directly" src="https://img.shields.io/badge/Contact%20the%20team%20directly-darkgreen">
+  </a>
 </div>
 
 
@@ -153,6 +150,19 @@ Weblate also allows you to log-in with major SSO providers like Github, Gitlab,
 - [HoloPlay](https://github.com/stephane-r/HoloPlay): Funny Android application connecting on Invidious API's with search, playlists and favorites.
 
 
+## Contact the team directly
+
+Every team member is available through GitHub or through the Matrix room (bridged to IRC), however, if you need/have too, you can contact the team directly via e-mail (remove `+SPAMGUARD` from the addresses):
+
+- General Inquiries (forwarded to every team member): `contact +SPAMGUARD [at] invidious [dot] io`
+
+Note: before sending a bug report please check that it hasn't already be reported on GitHub - bug reports sent to this address will be copied to GitHub
+
+- Security issues (forwarded to the two project owners, <a href="https://github.com/TheFrenchGhosty">@TheFrenchGhosty</a> and <a href="https://github.com/Perflyst">@Perflyst</a>): `security +SPAMGUARD [at] invidious [dot] io`
+
+Note: the creation of a PGP key for this address is planned
+
+
 ## Liability
 
 We take no responsibility for the use of our tool, or external instances