diff --git a/assets/mail/email_template_reset.php b/assets/mail/email_template_reset.php
index 582cd11..18e2e4b 100644
--- a/assets/mail/email_template_reset.php
+++ b/assets/mail/email_template_reset.php
@@ -5,8 +5,8 @@ defined($security_key) or exit;
//------------------------------------------
$changeuser_subject = 'CustomerPortal - password reset requested';
$changeuser_header = 'Dear CustomerPortal user';
-$changeuser_text = 'A password reset has been requested for your account. To reset your account use the link below.';
-$changeuser_credential_label = 'Link to portal:';
+$changeuser_text = 'A password reset has been requested for your account.';
+$changeuser_credential_text_1 = 'Please click the button below to reset the password of your CustomerPortal account.';
$changeuser_closure = 'For security reasons this link is only active for 10 minutes.';
//------------------------------------------
@@ -14,6 +14,90 @@ $changeuser_closure = 'For security reasons this link is only active for 10 minu
//------------------------------------------
$subject = $changeuser_subject;
+$message = '
+
+
+
+
+
+ ' . $subject . '
+
+
+
+
+ ' . $changeuser_closure . '
+
+
+ Kind regards,
+
+
+ Service team
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+';
+
$message = '
diff --git a/assets/mail/email_template_software.php b/assets/mail/email_template_software.php
index 37b5393..5584192 100644
--- a/assets/mail/email_template_software.php
+++ b/assets/mail/email_template_software.php
@@ -5,8 +5,8 @@ defined($security_key) or exit;
//------------------------------------------
$register_user_subject = 'CustomerPortal - Registration';
$register_user_header = 'Dear customer';
-$register_user_text = 'Thanks for your registration. Based on your product registration we herewith provide you access to our online firmware update capability, with the following credentials:';
-$register_user_credential_label = 'User details:';
+$register_user_text = 'Thanks for your registration. Based on your product registration we herewith provide you access to our online firmware update capability';
+$register_user_credential_text = 'To update your product click on the button below and use username '.software_update_user.' and password '.software_update_pw.' to login';
$register_user_closure = 'This is a generic account and cannot be changed.';
//------------------------------------------
@@ -15,34 +15,84 @@ $register_user_closure = 'This is a generic account and cannot be changed.';
$subject = $register_user_subject;
$message = '
-
-
+
+
+
+
+
' . $subject . '
-
-
- ' . $register_user_header . ',
-
-
- ' . $register_user_text . '
-