diff --git a/notifications_consumer/email_templates/base_email.html b/notifications_consumer/email_templates/base_email.html
index 821b1c0b3abac2c3c3ce729207702a4b31bfde81..838905cea6b545a7450e153355626b698de4833b 100644
--- a/notifications_consumer/email_templates/base_email.html
+++ b/notifications_consumer/email_templates/base_email.html
@@ -43,8 +43,10 @@
               <p style="padding: 10px;">
                 This notification has been sent by CERN Notifications. <br/>
                 <a href="{{ base_url }}/#subscriptions">Manage your subscriptions</a> |
-                <a href="{{ base_url }}/#manage">Manage your channels</a> |
-                <a href="{{ base_url }}/unsubscribe/{{ unsubscribe_blob }}/{{ unsubscribe_mail }}">Unsubscribe</a>
+                <a href="{{ base_url }}/#manage">Manage your channels</a> 
+                 {% if unsubscribe_blob %} 
+                     | <a href="{{ base_url }}/unsubscribe/{{ unsubscribe_blob }}/{{ unsubscribe_mail }}">Unsubscribe</a>
+                 {% endif %}
               </p>
             </td>
           </tr>
diff --git a/notifications_consumer/processors/email/templates/notification_body.html b/notifications_consumer/processors/email/templates/notification_body.html
index 4369574d35b8f60a20cde1e9ba75dcabad03691a..fcd8cf0ada5856cb2cb7be21dc604ec9328d694c 100644
--- a/notifications_consumer/processors/email/templates/notification_body.html
+++ b/notifications_consumer/processors/email/templates/notification_body.html
@@ -8,7 +8,7 @@
               &#9888;
             </span>
           {% endif %}
-          <span style="color: #3071AB; font-size: 1.2em;">{{ summary }}</span></b>
+          <span style="color: #3071AB; font-size: 1.2em; vertical-align: middle;">{{ summary }}</span></b>
       </a>
         <br/>
         <span style="color: #aaa;">{{ created_at }}</span>
diff --git a/notifications_consumer/processors/email/utils.py b/notifications_consumer/processors/email/utils.py
index e635ea5a1f91d171c245ef4499ed9c1a4deed5be..8cf95f8c436dbb2db910f41853d2e538f0d3d25e 100644
--- a/notifications_consumer/processors/email/utils.py
+++ b/notifications_consumer/processors/email/utils.py
@@ -24,9 +24,10 @@ def create_email(
 
     recipient_emails: List that should contain only one recipient for customized content to work
     """
+    context["base_url"] = Config.WEB_URL
+    context["service_name"] = Config.SERVICE_NAME
+
     if not internal:
-        context["base_url"] = Config.WEB_URL
-        context["service_name"] = Config.SERVICE_NAME
         aes = AESCipher(Config.EMAIL_AES_SECRET_KEY[:32])
         context["unsubscribe_blob"] = aes.encrypt(recipient_emails[0])
         context["unsubscribe_mail"] = urllib.parse.quote_plus(recipient_emails[0])
diff --git a/notifications_consumer/processors/email_daily/templates/daily_notification.html b/notifications_consumer/processors/email_daily/templates/daily_notification.html
index a007e0e0eabe2d1b68f0f46bf572ed833a151ece..253cb02ec5c80998c0c102b3270911ac53b382c7 100644
--- a/notifications_consumer/processors/email_daily/templates/daily_notification.html
+++ b/notifications_consumer/processors/email_daily/templates/daily_notification.html
@@ -24,11 +24,11 @@
                 {% for notification in notifications[:3] %}
                 <tr>
                     <td style="padding:10px">
-                        <p style="line-height: 145%;"><b>{% if notification.priority and notification.priority.upper() ==
+                        <p><b>{% if notification.priority and notification.priority.upper() ==
                                 notification_priority.IMPORTANT %} <span
                                     style="color: #FF5144; font-size: 1.5em; vertical-align: middle;">
                                     &#9888;</span> {% endif %}
-                                <span style="color: #3071AB;">{{ notification.summary }}</span></b>
+                                <span style="color: #3071AB; font-size: 1.2em; vertical-align: middle;">{{ notification.summary }}</span></b>
                             <br>
                             {{ notification.body|striptags|trim|truncate(250, True) }}
                             <a style="text-decoration:none"
diff --git a/notifications_consumer/processors/email_gateway_failure/processor.py b/notifications_consumer/processors/email_gateway_failure/processor.py
index 2800d86ecfe2905e93c4c479fea6abe25ce000c9..a06a3922f7bb39119209d9d3f11d51e0c1907871 100644
--- a/notifications_consumer/processors/email_gateway_failure/processor.py
+++ b/notifications_consumer/processors/email_gateway_failure/processor.py
@@ -107,6 +107,7 @@ class EmailGatewayFailureProcessor(Processor):
             text_template,
             html_template,
             context,
+            True
         )
 
         return send_emails([email])