diff --git a/_data/author.yml b/_data/author.yml
index 6445b1e..4db32bb 100644
--- a/_data/author.yml
+++ b/_data/author.yml
@@ -7,10 +7,9 @@ age: 23
 location: Hamburg, Germany
 cv_link: /cv/
 cv_pdf: /assets/pdf/cv.pdf
-job_email: jobs@2martens.de
-job_email_spam_proof: jobs at 2martens de
-politics_email: politik@2martens.de
-politics_email_spam_proof: politik at 2martens de
+generic_email: topic@2martens.de
+job_topic: jobs
+politics_topic: politik
 github_username: 2martens
 twitter_username: 2martens
 publications:
diff --git a/_includes/sidebar/job_offers.html b/_includes/sidebar/job_offers.html
index b4e2aed..4cfecac 100644
--- a/_includes/sidebar/job_offers.html
+++ b/_includes/sidebar/job_offers.html
@@ -2,7 +2,7 @@
     <div class="card-body">
         <p class="card-text">
             Job offers:<br>
-            <span class="fas fa-envelope"></span>&nbsp;<a href='mailto:{{ site.data.author.job_email }}'>{{ site.data.author.job_email_spam_proof }}</a>
+            <span class="fas fa-envelope"></span>&nbsp;{{ site.data.author.generic_email }}, with topic = {{ site.data.author.job_topic }}
         </p>
     </div>
 </div>
\ No newline at end of file
diff --git a/_includes/sidebar/politics_qanda.html b/_includes/sidebar/politics_qanda.html
index 8d3c636..a1dec2e 100644
--- a/_includes/sidebar/politics_qanda.html
+++ b/_includes/sidebar/politics_qanda.html
@@ -2,7 +2,7 @@
     <div class="card-body">
         <p class="card-text">
             Questions? Suggestions?:<br>
-            <span class="fas fa-envelope"></span>&nbsp;<a href='mailto:{{ site.data.author.politics_email }}'>{{ site.data.author.politics_email_spam_proof }}</a>
+            <span class="fas fa-envelope"></span>&nbsp;{{ site.data.author.generic_email }}, with topic = {{ site.data.author.politics_topic }}
         </p>
     </div>
 </div>
\ No newline at end of file