diff --git a/content/contact.md b/content/contact.md
index 5d875b5..6665e3e 100644
--- a/content/contact.md
+++ b/content/contact.md
@@ -6,9 +6,34 @@ description = "contact"
 date = 2020-02-26T13:00:08+01:00
 +++
 
-Visit our matrix room at: 
-[#public:matrix.avaframe.org](https://matrix.to/#/!qmUrKSNurDoVuKAtRU:matrix.avaframe.org?via=matrix.avaframe.org)
+We are using https://element.io/ / https://matrix.org/ for our communication.
 
-If you don't have a matrix account yet, we suggest to use
-[riot.im](https://riot.im/app/#/welcome) to create an account. 
-<!-- [Foo image](/pdf/20200214_Ausschreibung_Numeriker.pdf) -->
+<!-- Visit our matrix room at:  -->
+<!-- [#public:matrix.avaframe.org](https://matrix.to/#/!qmUrKSNurDoVuKAtRU:matrix.avaframe.org?via=matrix.avaframe.org) -->
+
+### You don’t have an acocunt, go to:
+
+https://app.element.io/#/register -> Create Account
+
+You can choose between using:
+   - matrix.org, this is the default.
+   - your own or another infrastructure (universities, company, …). Setup via: Edit -> add your own homeserver.
+
+Note: It does not matter where your account originates, it works for the whole matrix environment.
+
+Once you’re done, head to the next step:
+
+### You have an element/matrix account
+
+Use a client of your choice (see below) to connect to room
+
+#public:matrix.avaframe.org
+
+You will end up in the Public room in which you can contact us. If this for some reason does not work, send your matrix address to:
+@fso:matrix.avaframe.org
+and you will be added manually.
+
+### Clients
+
+A comprehensive list of clients can be found here: https://matrix.org/clients/.
+Starting with the Element ones (Android/Web/Desktop) is a good beginners choice.
diff --git a/public/contact/index.html b/public/contact/index.html
index 620a431..5afb61a 100644
--- a/public/contact/index.html
+++ b/public/contact/index.html
@@ -94,11 +94,27 @@
       <h1>Contact</h1>
     </header>
 
-    <p>Visit our matrix room at:
-<a href="https://matrix.to/#/!qmUrKSNurDoVuKAtRU:matrix.avaframe.org?via=matrix.avaframe.org">#public:matrix.avaframe.org</a></p>
-<p>If you don&rsquo;t have a matrix account yet, we suggest to use
-<a href="https://riot.im/app/#/welcome">riot.im</a> to create an account.</p>
+    <p>We are using <a href="https://element.io/">https://element.io/</a> / <a href="https://matrix.org/">https://matrix.org/</a> for our communication.</p>
 <!-- raw HTML omitted -->
+<!-- raw HTML omitted -->
+<h3 id="you-dont-have-an-acocunt-go-to">You don’t have an acocunt, go to:</h3>
+<p><a href="https://app.element.io/#/register">https://app.element.io/#/register</a> -&gt; Create Account</p>
+<p>You can choose between using:</p>
+<ul>
+<li>matrix.org, this is the default.</li>
+<li>your own or another infrastructure (universities, company, …). Setup via: Edit -&gt; add your own homeserver.</li>
+</ul>
+<p>Note: It does not matter where your account originates, it works for the whole matrix environment.</p>
+<p>Once you’re done, head to the next step:</p>
+<h3 id="you-have-an-elementmatrix-account">You have an element/matrix account</h3>
+<p>Use a client of your choice (see below) to connect to room</p>
+<p>#public:matrix.avaframe.org</p>
+<p>You will end up in the Public room in which you can contact us. If this for some reason does not work, send your matrix address to:
+@fso:matrix.avaframe.org
+and you will be added manually.</p>
+<h3 id="clients">Clients</h3>
+<p>A comprehensive list of clients can be found here: <a href="https://matrix.org/clients/">https://matrix.org/clients/</a>.
+Starting with the Element ones (Android/Web/Desktop) is a good beginners choice.</p>
 
   </article>
 </section>
diff --git a/public/index.xml b/public/index.xml
index 82b2c9e..253d113 100644
--- a/public/index.xml
+++ b/public/index.xml
@@ -344,8 +344,11 @@ Our mission is to
       <pubDate>Wed, 26 Feb 2020 13:00:08 +0100</pubDate>
       
       <guid>https://avaframe.org/contact/</guid>
-      <description>Visit our matrix room at: #public:matrix.avaframe.org
-If you don&amp;rsquo;t have a matrix account yet, we suggest to use riot.im to create an account.</description>
+      <description>We are using https://element.io/ / https://matrix.org/ for our communication.
+You don’t have an acocunt, go to: https://app.element.io/#/register -&amp;gt; Create Account
+You can choose between using:
+ matrix.org, this is the default. your own or another infrastructure (universities, company, …). Setup via: Edit -&amp;gt; add your own homeserver.  Note: It does not matter where your account originates, it works for the whole matrix environment.
+Once you’re done, head to the next step:</description>
     </item>
     
   </channel>