diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php
index 92546bbcca8..b8ae1820693 100755
--- a/main/inc/lib/usermanager.lib.php
+++ b/main/inc/lib/usermanager.lib.php
@@ -364,7 +364,10 @@ public static function create_user(
 
             if (!empty($email) && $send_mail) {
                 $recipient_name = api_get_person_name($firstName, $lastName, null, PERSON_NAME_EMAIL_ADDRESS);
-                $emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
+                $tplSubject = new Template(null, false, false, false, false, false);
+                $tplSubject->assign('mailSiteName', api_get_setting('siteName'));
+                $layoutSubject = $tplSubject->get_template('mail/subject_registration_platform.tpl');
+                $emailSubject = $tplSubject->fetch($layoutSubject);
                 $sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
                 $email_admin = api_get_setting('emailAdministrator');
 
@@ -372,12 +375,26 @@ public static function create_user(
                     $access_url_id = api_get_current_access_url_id();
                     if ($access_url_id != -1) {
                         $url = api_get_access_url($access_url_id);
-                        $emailbody = get_lang('Dear')." ".stripslashes(api_get_person_name($firstName, $lastName)).",\n\n".get_lang('YouAreReg')." ".api_get_setting('siteName')." ".get_lang('WithTheFollowingSettings')."\n\n".get_lang('Username')." : ".$loginName."\n".get_lang('Pass')." : ".stripslashes($original_password)."\n\n".get_lang('Address')." ".api_get_setting('siteName')." ".get_lang('Is')." : ".$url['url']."\n\n".get_lang('Problem')."\n\n".get_lang('SignatureFormula').",\n\n".api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n".get_lang('Manager')." ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n".get_lang('Email')." : ".api_get_setting('emailAdministrator');
                     }
                 } else {
-                    $emailbody = get_lang('Dear')." ".stripslashes(api_get_person_name($firstName, $lastName)).",\n\n".get_lang('YouAreReg')." ".api_get_setting('siteName')." ".get_lang('WithTheFollowingSettings')."\n\n".get_lang('Username')." : ".$loginName."\n".get_lang('Pass')." : ".stripslashes($original_password)."\n\n".get_lang('Address')." ".api_get_setting('siteName')." ".get_lang('Is')." : ".$_configuration['root_web']."\n\n".get_lang('Problem')."\n\n".get_lang('SignatureFormula').",\n\n".api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n".get_lang('Manager')." ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n".get_lang('Email')." : ".api_get_setting('emailAdministrator');
+                    $url = $_configuration['root_web'];
                 }
-
+                $tplContent = new Template(null, false, false, false, false, false);
+                // variables for the default template
+                $tplContent->assign('mailCompleteName', stripslashes(api_get_person_name($firstName, $lastName)));
+                $tplContent->assign('mailSiteName', api_get_setting('siteName'));
+                $tplContent->assign('mailLoginName', $loginName);
+                $tplContent->assign('mailOriginalPassword', stripslashes($original_password));
+                $tplContent->assign('mailWebPath', $url);
+                $tplContent->assign('mailAdministratorName', api_get_setting('administratorName'));
+                $tplContent->assign('mailAdministratorSurname', api_get_setting('administratorSurname'));
+                $tplContent->assign('mailAdministratorTelephone', api_get_setting('administratorTelephone'));
+                $tplContent->assign('mailEmailAdministrator', api_get_setting('emailAdministrator'));
+                // variables for others templates
+                $tplContent->assign('mailEmailAdministrator', api_get_setting('emailAdministrator'));
+
+                $layoutContent = $tplContent->get_template('mail/content_registration_platform.tpl');
+                $emailBody = $tplContent->fetch($layoutContent);
                 /* MANAGE EVENT WITH MAIL */
                 if (EventsMail::check_if_using_class('user_registration')) {
                     $values["about_user"] = $return;
@@ -398,8 +415,8 @@ public static function create_user(
                     api_mail_html(
                         $recipient_name,
                         $email,
-                        $emailsubject,
-                        $emailbody,
+                        $emailSubject,
+                        $emailBody,
                         $sender_name,
                         $email_admin,
                         null,
diff --git a/main/template/default/mail/content_registration_platform.tpl b/main/template/default/mail/content_registration_platform.tpl
new file mode 100644
index 00000000000..41424b55382
--- /dev/null
+++ b/main/template/default/mail/content_registration_platform.tpl
@@ -0,0 +1,14 @@
+{{ 'Dear' | get_lang}} {{ mailCompleteName }},
+</br>
+{{ 'YouAreReg' | get_lang }} {{ mailSiteName }} {{ 'WithTheFollowingSettings' | get_lang }}</br>
+{{ 'Username' | get_lang }} : {{ mailLoginName }}
+{{ 'Pass' | get_lang }} : {{ mailOriginalPassword }}
+</br></br>
+{{ 'Address' | get_lang}} {{ mailSiteName }} {{ 'Is' | get_lang }} : {{ mailWebPath }}</br>
+{{ 'Problem' | get_lang}}</br>
+{{ 'SignatureFormula' | get_lang }}</br>
+{{ mailAdministratorName }}, {{ mailAdministratorSurname }}
+{{ 'Manager' | get_lang }} {{ mailSiteName }}
+T. {{ mailAdministratorTelephone}}
+</br>
+{{ 'Email' | get_lang }} : {{ emailAdministrator }}
\ No newline at end of file
diff --git a/main/template/default/mail/content_subscription_to_session_confirmation.tpl b/main/template/default/mail/content_subscription_to_session_confirmation.tpl
index 86be258c1a9..7726b1e1b23 100644
--- a/main/template/default/mail/content_subscription_to_session_confirmation.tpl
+++ b/main/template/default/mail/content_subscription_to_session_confirmation.tpl
@@ -1 +1,12 @@
-{{mailSiteName}} {{ 'YourReg' | get_lang}} {{mailSiteName}}
+{{ 'Dear' | get_lang}} {{ mailCompleteName }},
+</br>
+{{ 'YouAreRegisterToSessionX' | get_lang | format(mailSessionName)}}
+</br>
+{{ 'Address' | get_lang }}  {{ mailSiteName }} {{ 'Is' | get_lang }} : {{ mailWebPath }}</br>
+{{ 'Problem' | get_lang}}</br>
+{{ 'SignatureFormula' | get_lang }}</br>
+{{ mailAdministratorName }} {{ mailAdministratorSurname }}
+{{ 'Manager' | get_lang }} {{ mailSiteName }}
+T. {{ mailAdministratorTelephone}}
+</br>
+{{ 'Email' | get_lang }} : {{ emailAdministrator }}
\ No newline at end of file
diff --git a/main/template/default/mail/subject_registration_platform.tpl b/main/template/default/mail/subject_registration_platform.tpl
new file mode 100644
index 00000000000..46a6fc426cc
--- /dev/null
+++ b/main/template/default/mail/subject_registration_platform.tpl
@@ -0,0 +1 @@
+{{mailSiteName}} {{ 'YourReg' | get_lang}} {{mailSiteName}}
\ No newline at end of file
diff --git a/main/template/default/mail/subject_subscription_to_session_confirmation.tpl b/main/template/default/mail/subject_subscription_to_session_confirmation.tpl
index 45f55220785..46a6fc426cc 100644
--- a/main/template/default/mail/subject_subscription_to_session_confirmation.tpl
+++ b/main/template/default/mail/subject_subscription_to_session_confirmation.tpl
@@ -1,17 +1 @@
-{{ 'Dear' | get_lang}} {{ mailCompleteName }},
-</br></br>
-{{ 'YouAreRegisterToSessionX' | get_lang | format(mailSessionName)}}
-</br></br>
-{{ 'Address' | get_lang }}  {{ mailSiteName }} {{ 'Is' | get_lang }} : {{ mailWebPath }}
-</br></br>
-{{ 'Problem' | get_lang}}
-</br></br>
-{{ 'SignatureFormula' | get_lang }}
-</br></br>
-{{ mailAdministratorName }} {{ mailAdministratorSurname }}
-</br>
-{{ 'Manager' | get_lang }} {{ mailSiteName }}
-</br>
-T. {{ mailAdministratorTelephone}}
-</br>
-{{ 'Email' | get_lang }} : {{ emailAdministrator }}
+{{mailSiteName}} {{ 'YourReg' | get_lang}} {{mailSiteName}}
\ No newline at end of file