diff --git a/Modelica/Icons.mo b/Modelica/Icons.mo
index 5ef0aac2aa..750ed6cc6a 100644
--- a/Modelica/Icons.mo
+++ b/Modelica/Icons.mo
@@ -804,11 +804,10 @@ corresponding library in a future release.
     <dd><a href=\"https://christiankral.net/\">Electric Machines, Drives and Systems</a></dd>
     <dd>1060 Vienna, Austria</dd>
     <dd>email: <a href=\"mailto:dr.christian.kral@gmail.com\">dr.christian.kral@gmail.com</a><br></dd>
-<dt>Johan Andreasson</dt>
+<dt>Johan Andreasson, previously at</dt>
     <dd><a href=\"https://www.modelon.com/\">Modelon AB</a></dd>
     <dd>Ideon Science Park</dd>
     <dd>22370 Lund, Sweden</dd>
-    <dd>email: <a href=\"mailto:johan.andreasson@modelon.se\">johan.andreasson@modelon.se</a></dd>
 </dl>
 
 <p>
diff --git a/Modelica/Media/Water/IF97_Utilities.mo b/Modelica/Media/Water/IF97_Utilities.mo
index 40e9eaa17c..713627ca79 100644
--- a/Modelica/Media/Water/IF97_Utilities.mo
+++ b/Modelica/Media/Water/IF97_Utilities.mo
@@ -84,11 +84,10 @@ SCRIT and HCRIT are calculated from Helmholtz function for region 3.</p>
   </li>
 </ul>
 <address>
-Author: Hubertus Tummescheit,<br>
+Author: Hubertus Tummescheit, previously at<br>
 Modelon AB<br>
 Ideon Science Park<br>
 SE-22370 Lund, Sweden<br>
-email: hubertus@modelon.se
 </address>
 <ul>
   <li>Initial version: July 2000</li>
@@ -148,11 +147,10 @@ Critical point data for IF97 steam properties. SCRIT and HCRIT are calculated fr
   </li>
 </ul>
 <address>
-Author: Hubertus Tummescheit,<br>
+Author: Hubertus Tummescheit, previously at<br>
 Modelon AB<br>
 Ideon Science Park<br>
 SE-22370 Lund, Sweden<br>
-email: hubertus@modelon.se
 </address>
 <ul>
   <li>Initial version: July 2000</li>
@@ -181,11 +179,10 @@ email: hubertus@modelon.se
   </li>
 </ul>
 <address>
-Author: Hubertus Tummescheit,<br>
+Author: Hubertus Tummescheit, previously at<br>
 Modelon AB<br>
 Ideon Science Park<br>
 SE-22370 Lund, Sweden<br>
-email: hubertus@modelon.se
 </address>
 <ul>
   <li>Initial version: July 2000</li>
@@ -1717,7 +1714,6 @@ Authors: Hubertus Tummescheit, Jonas Eborn and Falko Jens Wagner<br>
 Modelon AB<br>
 Ideon Science Park<br>
 SE-22370 Lund, Sweden<br>
-email: hubertus@modelon.se
 </address>
 <ul>
   <li>Initial version: July 2000</li>
@@ -3855,11 +3851,10 @@ simultaneously optimize the functions and the directional derivatives because th
   </li>
 </ul>
 <address>
-Author: Hubertus Tummescheit,<br>
+Author: Hubertus Tummescheit, previously at<br>
 Modelon AB<br>
 Ideon Science Park<br>
 SE-22370 Lund, Sweden<br>
-email: hubertus@modelon.se
 </address>
 <ul>
   <li>Initial version: July 2000</li>
@@ -4354,7 +4349,6 @@ Authors: Hubertus Tummescheit and Jonas Eborn<br>
 Modelon AB<br>
 Ideon Science Park<br>
 SE-22370 Lund, Sweden<br>
-email: hubertus@modelon.se
 </address>
 <ul>
   <li>Initial version: October 2002</li>
@@ -5014,11 +5008,10 @@ email: hubertus@modelon.se
   </li>
 </ul>
 <address>
-Author: Hubertus Tummescheit,<br>
+Author: Hubertus Tummescheit, previously at<br>
 Modelon AB<br>
 Ideon Science Park<br>
 SE-22370 Lund, Sweden<br>
-email: hubertus@modelon.se
 </address>
 <ul>
   <li>Initial version: July 2000</li>
@@ -5669,11 +5662,10 @@ email: hubertus@modelon.se
   </li>
 </ul>
 <address>
-Author: Hubertus Tummescheit,<br>
+Author: Hubertus Tummescheit, previously at<br>
 Modelon AB<br>
 Ideon Science Park<br>
 SE-22370 Lund, Sweden<br>
-email: hubertus@modelon.se
 </address>
 <ul>
   <li>Initial version: July 2000</li>
@@ -5776,11 +5768,10 @@ one phase regions of IAPWS/IF97
   </li>
 </ul>
 <address>
-Author: Hubertus Tummescheit,<br>
+Author: Hubertus Tummescheit, previously at<br>
 Modelon AB<br>
 Ideon Science Park<br>
 SE-22370 Lund, Sweden<br>
-email: hubertus@modelon.se
 </address>
 <ul>
   <li>Initial version: July 2000</li>
@@ -6051,11 +6042,10 @@ in the two-phase region and on the phase boundaries.
   </li>
 </ul>
 <address>
-Author: Hubertus Tummescheit,<br>
+Author: Hubertus Tummescheit, previously at<br>
 Modelon AB<br>
 Ideon Science Park<br>
 SE-22370 Lund, Sweden<br>
-email: hubertus@modelon.se
 </address>
 <ul>
   <li>Initial version: July 2000</li>
@@ -6171,16 +6161,15 @@ white-space:nowrap;
   </li>
   <li>
     Code reorganization, enhanced documentation, additional functions:   <em>December, 2002</em>
-    by <a href=\"mailto:Hubertus.Tummescheit@modelon.se\">Hubertus Tummescheit</a> and moved to Modelica
+    by <a href=\"https://github.com/hubertus65\">Hubertus Tummescheit</a> and moved to Modelica
     properties library.
   </li>
 </ul>
 <address>
-Author: Hubertus Tummescheit,<br>
+Author: Hubertus Tummescheit, previously at<br>
 Modelon AB<br>
 Ideon Science Park<br>
 SE-22370 Lund, Sweden<br>
-email: hubertus@modelon.se
 </address>
 <p>
 In September 1997, the International Association for the Properties
@@ -8721,16 +8710,15 @@ properties library. The following documents are included
   </li>
   <li>
     Code reorganization, enhanced documentation, additional functions:   <em>December, 2002</em>
-    by <a href=\"mailto:Hubertus.Tummescheit@modelon.se\">Hubertus Tummescheit</a> and moved to Modelica
+    by <a href=\"https://github.com/hubertus65\">Hubertus Tummescheit</a> and moved to Modelica
     properties library.
   </li>
 </ul>
 <address>
-Author: Hubertus Tummescheit,<br>
+Author: Hubertus Tummescheit, previously at<br>
 Modelon AB<br>
 Ideon Science Park<br>
 SE-22370 Lund, Sweden<br>
-email: hubertus@modelon.se
 </address>
 </html>", revisions="<html>
 <h4>Intermediate release notes during development</h4>
diff --git a/Modelica/Media/package.mo b/Modelica/Media/package.mo
index 441f23d82e..86f7dde642 100644
--- a/Modelica/Media/package.mo
+++ b/Modelica/Media/package.mo
@@ -2015,11 +2015,10 @@ for the Modelica'2003 conference (for evaluation).
 <h4>Library officer and main author</h4>
 
 <p>
-<strong>Hubertus Tummescheit</strong><br>
+<strong>Hubertus Tummescheit</strong>, previously at<br>
 Modelon AB<br>
 Ideon Science Park<br>
 SE-22730 Lund, Sweden<br>
-email: <a href=\"mailto:Hubertus.Tummescheit@Modelon.se\">Hubertus.Tummescheit@Modelon.se</a>
 </p>
 
 <h4>Acknowledgements</h4>
@@ -5113,11 +5112,10 @@ to the above list of assumptions</li>
     I-20133 Milano, Italy<br>
     email: <a href=\"mailto:casella@elet.polimi.it\">casella@elet.polimi.it</a><br>
     and<br>
-    Hubertus Tummescheit<br>
+    Hubertus Tummescheit, previously at<br>
     Modelon AB<br>
     Ideon Science Park<br>
     SE-22730 Lund, Sweden<br>
-    email: <a href=\"mailto:Hubertus.Tummescheit@Modelon.se\">Hubertus.Tummescheit@Modelon.se</a>
 </dd>
 </dl>
 </html>"));
diff --git a/Modelica/UsersGuide/Contact.mo b/Modelica/UsersGuide/Contact.mo
index bdf530c49a..5edb06b74a 100644
--- a/Modelica/UsersGuide/Contact.mo
+++ b/Modelica/UsersGuide/Contact.mo
@@ -401,7 +401,9 @@ of the Modelica package (many more people have contributed to the design):
 </tr>
 
 <tr><td><strong>Michael Tiller</strong></td>
-   <td>Xogeny Inc., Canton, MI, U.S.A.<br>
+   <td>JuliaHub<br>
+     previously at:<br>
+     Xogeny Inc., Canton, MI, U.S.A.<br>
      previously at:<br>
      Emmeskay, Inc., Dearborn, MI, U.S.A.<br>
      previously at:<br>
@@ -411,7 +413,8 @@ of the Modelica package (many more people have contributed to the design):
 </tr>
 
 <tr><td><strong>Hubertus Tummescheit</strong></td>
-   <td>Modelon, Inc., Hartford, CT, U.S.A.</td>
+   <td>previously at:<br>
+     Modelon, Inc., Hartford, CT, U.S.A.</td>
    <td>Modelica.Media<br>
                       Modelica.Thermal.HeatTransfer</td>
 </tr>