diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
index 9345b5b7c357139cfe4c8bda92c243de94c58d3a..10e3f3cadd640efc130e84182de38f32dcbb93d5 100644
--- a/interface/web/client/client_edit.php
+++ b/interface/web/client/client_edit.php
@@ -348,8 +348,7 @@ class page_action extends tform_actions {
 		$sql = "SELECT * FROM client_message_template WHERE template_type = 'welcome' AND sys_groupid = ?";
 		$email_template = $app->db->queryOneRecord($sql, $client_group_id);
 		$client = $app->tform->getDataRecord($this->id);
-
-		if(is_array($email_template) && $client['email'] != '') {
+		if(is_array($email_template) && $email_template['subject'] != '' && $email_template['message'] != '' && $client['email'] != '') {
 			//* Parse client details into message
 			$message = $email_template['message'];
 			$subject = $email_template['subject'];
diff --git a/interface/web/client/form/message_template.tform.php b/interface/web/client/form/message_template.tform.php
index 421b1af71374040e6c7a60bdb64b04481fdd679d..14dfea1cd0904ebeec69b27c2bf1b05de435b707 100644
--- a/interface/web/client/form/message_template.tform.php
+++ b/interface/web/client/form/message_template.tform.php
@@ -78,6 +78,9 @@ $form["tabs"]['template'] = array (
 		'subject' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
+			'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
+				'errmsg'=> 'subject_error_empty'),
+			),
 			'default' => '',
 			'value'  => '',
 			'separator' => '',
@@ -89,6 +92,9 @@ $form["tabs"]['template'] = array (
 		'message' => array (
 			'datatype' => 'TEXT',
 			'formtype' => 'TEXTAREA',
+			'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
+				'errmsg'=> 'message_error_empty'),
+			),
 			'default' => '',
 			'value'  => '',
 			'separator' => '',
diff --git a/interface/web/client/lib/lang/de_client_message_template.lng b/interface/web/client/lib/lang/de_client_message_template.lng
index 3c6ba86f3637ab0bdaa1692766ac22a2059809a4..5a260eb01d2e850c77dfb00ed39eff5024b80b0c 100644
--- a/interface/web/client/lib/lang/de_client_message_template.lng
+++ b/interface/web/client/lib/lang/de_client_message_template.lng
@@ -8,4 +8,6 @@ $wb['Settings'] = 'Einstellung';
 $wb['variables_txt'] = 'Variable';
 $wb['variables_description_txt'] = '(Die Benutzername und Passwort Variable können nur in Willkommensnachrichten verwendet werden.)';
 $wb['duplicate_welcome_error'] = 'Es kann nur eine Standard Willkommensnachrichten Vorlage geben. Bitte bearbeiten Sie die bestehende Vorlage anstatt eine neue hinzuzufügen.';
+$wb['subject_error_empty'] = 'Betreff ist leer';
+$wb['message_error_empty'] = 'Nachricht ist leer';
 ?>
diff --git a/interface/web/client/lib/lang/en_client_message_template.lng b/interface/web/client/lib/lang/en_client_message_template.lng
index 42cd796047d622304b701aa2aac2e9bd22d01c3f..0606f537584fa59c24ae58f70e5ac75257dcd233 100644
--- a/interface/web/client/lib/lang/en_client_message_template.lng
+++ b/interface/web/client/lib/lang/en_client_message_template.lng
@@ -8,4 +8,6 @@ $wb['Settings'] = 'Setting';
 $wb['variables_txt'] = 'Variables';
 $wb['variables_description_txt'] = '(The username and password variables are only available in welcome emails.)';
 $wb['duplicate_welcome_error'] = 'There can be only one default welcome email template. Please edit the existing template instead of adding a new one.';
-?>
\ No newline at end of file
+$wb['subject_error_empty'] = 'Subject is empty';
+$wb['message_error_empty'] = 'Message is empty';
+?>