diff --git a/initdb/02_3_1_signalk_public_tables.sql b/initdb/02_3_1_signalk_public_tables.sql
index d19199f..14ed6ae 100644
--- a/initdb/02_3_1_signalk_public_tables.sql
+++ b/initdb/02_3_1_signalk_public_tables.sql
@@ -61,32 +61,32 @@ INSERT INTO email_templates VALUES
     'Welcome',
     E'Hello __RECIPIENT__,\nCongratulations!\nYou successfully created an account.\nKeep in mind to register your vessel.\nHappy sailing!',
     'Welcome',
-    E'Hi!\nYou successfully created an account\nKeep in mind to register your vessel.\nHappy sailing!'),
+    E'Hi!\nYou successfully created an account\nKeep in mind to register your vessel.\n'),
 ('new_vessel',
     'New vessel',
-    E'Hi!\nHow are you?\n__BOAT__ is now linked to your account.',
+    E'Hi!\nHow are you?\n__BOAT__ is now linked to your account.\n',
     'New vessel',
-    E'Hi!\nHow are you?\n__BOAT__ is now linked to your account.'),
+    E'Hi!\nHow are you?\n__BOAT__ is now linked to your account.\n'),
 ('monitor_offline',
     'Vessel Offline',
-    E'__BOAT__ has been offline for more than an hour\r\nFind more details at __APP_URL__/boats/\n',
+    E'__BOAT__ has been offline for more than an hour\r\nFind more details at __APP_URL__/boats\n',
     'Vessel Offline',
-    E'__BOAT__ has been offline for more than an hour\r\nFind more details at __APP_URL__/boats/\n'),
+    E'__BOAT__ has been offline for more than an hour\r\nFind more details at __APP_URL__/boats\n'),
 ('monitor_online',
     'Vessel Online',
-    E'__BOAT__ just came online\nFind more details at __APP_URL__/boats/\n',
+    E'__BOAT__ just came online\nFind more details at __APP_URL__/boats\n',
     'Vessel Online',
-    E'__BOAT__ just came online\nFind more details at __APP_URL__/boats/\n'),
+    E'__BOAT__ just came online\nFind more details at __APP_URL__/boats\n'),
 ('new_badge',
     'New Badge!',
     E'Hello __RECIPIENT__,\nCongratulations! You have just unlocked a new badge: __BADGE_NAME__\nSee more details at __APP_URL__/badges\nHappy sailing!\nThe PostgSail Team',
     'New Badge!',
-    E'Congratulations!\nYou have just unlocked a new badge: __BADGE_NAME__\nSee more details at __APP_URL__/badges\nHappy sailing!\nThe PostgSail Team'),
+    E'Congratulations!\nYou have just unlocked a new badge: __BADGE_NAME__\nSee more details at __APP_URL__/badges\n'),
 ('pushover_valid',
     'Pushover integration',
     E'Hello __RECIPIENT__,\nCongratulations! You have just connect your account to Pushover.\n\nThe PostgSail Team',
     'Pushover integration!',
-    E'Congratulations!\nYou have just connect your account to Pushover.\n\nThe PostgSail Team'),
+    E'Congratulations!\nYou have just connect your account to Pushover.\n'),
 ('email_otp',
     'Email verification',
     E'Hello,\nPlease active your account using the following code: __OTP_CODE__.\nThe code is valid 15 minutes.\nThe PostgSail Team',
@@ -96,22 +96,22 @@ INSERT INTO email_templates VALUES
     'Email verified',
     E'Hello __RECIPIENT__,\nCongratulations!\nYou successfully validate your account.\nThe PostgSail Team',
     'Email verified',
-    E'Hi!\nYou successfully validate your account.\nHappy sailing!'),
+    E'Hi!\nYou successfully validate your account.\n'),
 ('email_reset',
     'Password reset',
     E'Hello,\nYou requested a password reset. To reset your password __APP_URL__/reset?__RESET_QS__.\nThe PostgSail Team',
     'Password reset',
-    E'You requested a password recovery. Check your email!'),
+    E'You requested a password recovery. Check your email!\n'),
 ('telegram_otp',
     'Telegram bot',
     E'Hello __RECIPIENT__,\nTo connect your account to a @postgsail_bot. Please type this verification code __OTP_CODE__ back to the bot.\nThe code is valid 15 minutes.\nThe PostgSail Team',
     'Telegram bot',
-    E'Congratulations!\nTo connect your account to a @postgsail_bot. Check your email!'),
+    E'Congratulations!\nTo connect your account to a @postgsail_bot. Check your email!\n'),
 ('telegram_valid',
     'Telegram bot',
     E'Hello __RECIPIENT__,\nCongratulations! You have just connect your account to your vessel, @postgsail_bot.\n\nThe PostgSail Team',
     'Telegram bot!',
-    E'Congratulations!\nYou have just connect your account to your vessel, @postgsail_bot.\n\nHappy sailing!\nThe PostgSail Team');
+    E'Congratulations!\nYou have just connect your account to your vessel, @postgsail_bot.\n');
 
 ---------------------------------------------------------------------------
 -- Queue handling