diff --git a/static/php/message.php b/static/php/message.php
index f104112..0a9648e 100644
--- a/static/php/message.php
+++ b/static/php/message.php
@@ -134,29 +134,40 @@ function constructMessage()
 	if ( ! isset($organisation) && $lang == "DE" )
 	{
 		$arrServiceTyps = [ "SOM", "PSY", "AÜP" ];
-		$message .= "<hr/><p><b>";
-		$message .= "Leistungen, die Sie anbieten";
-		$message .= "</b><br/>";
+		$strServiceTyps = "";
 		foreach ( $arrServiceTyps as $abbreviation )
 		{
 			if (isset( $_POST[$abbreviation]) )
 			{
-				$message .= $_POST[$abbreviation] . "<br/>";
+				$strServiceTyps .= $_POST[$abbreviation] . "<br/>";
 			}
 		}
-		$message .= "</p>";
+		if ( $strServiceTyps != "" )
+		{
+			$message .= "<hr/><p><b>";
+			$message .= "Leistungen, die Sie anbieten";
+			$message .= $strServiceTyps;
+			$message .= "</b><br/>";
+			$message .= "</p>";
+		}
+		
 		$arrAllCantons = [ "AG", "AI", "AR", "BE", "BL", "BS", "FR", "GE", "GL", "GR", "JU", "LU", "NE", "NW", "OW", "SG", "SH", "SO", "SZ", "TG", "UR", "VD", "VS", "ZG", "ZH" ];
-		$message .= "<hr/><p><b>";
-		$message .= "Kantone, in denen Sie eine Bewilligung (beantragt) haben";
-		$message .= "</b><br/>";
+		$strCantons = "";
 		foreach ( $arrAllCantons as $abbreviation )
 		{
 			if (isset( $_POST[$abbreviation]) )
 			{
-				$message .= $_POST[$abbreviation] . "<br/>";
+				$strCantons .= $_POST[$abbreviation] . "<br/>";
 			}
 		}
-		$message .= "</p>";
+		if ( $strCantons != "" )
+		{
+			$message .= "<hr/><p><b>";
+			$message .= "Kantone, in denen Sie eine Bewilligung (beantragt) haben";
+			$message .= "</b><br/>";
+			$message .= $strCantons;
+			$message .= "</p>";
+		}
 	}
 	
 	$modulpop2 = filter_input(INPUT_POST, 'modulpop2');