diff --git a/zero/Extensions/CharExtensions.cs b/zero/Extensions/CharExtensions.cs
index 1560fc9b..bb9ce986 100644
--- a/zero/Extensions/CharExtensions.cs
+++ b/zero/Extensions/CharExtensions.cs
@@ -18,7 +18,7 @@ public static class CharExtensions
     { 'ö', new char[2] { 'o', 'e' } },
     { 'ü', new char[2] { 'u', 'e' } },
     { 'ß', new char[2] { 's', 's' } },
-    { '&', new char[1] { '+' } }
+    //{ '&', new char[1] { '+' } }
   };
 
 
diff --git a/zero/Extensions/StringExtensions.cs b/zero/Extensions/StringExtensions.cs
index 497cc96c..474bd288 100644
--- a/zero/Extensions/StringExtensions.cs
+++ b/zero/Extensions/StringExtensions.cs
@@ -212,8 +212,28 @@ public static class StringExtensions
 
     return builder.ToString();
   }
-  
-  
+
+
+  public static string NewLinesToParagraphs(this string source, string classes = null)
+  {
+    StringBuilder builder = new();
+    string classAttribute = classes.HasValue() ? $" class=\"{classes}\"" : string.Empty;
+    builder.Append($"<p{classAttribute}>");
+    string[] lines = source.Split('\n');
+    for (int i = 0; i < lines.Length; i++)
+    {
+      if (i > 0)
+      {
+        builder.Append($"</p><p{classAttribute}>");
+      }
+      builder.Append(WebUtility.HtmlEncode(lines[i]));
+    }
+
+    builder.Append("</p>");
+    return builder.ToString();
+  }
+
+
   public static string FormatTwoFactorAuthenticationKey(this string unformattedKey)
   {
     var result = new StringBuilder();