diff --git a/app/views/layouts/_mailbot_footer.html.erb b/app/views/layouts/_mailbot_footer.html.erb
index 3cc8b3c3..4cc06c7f 100644
--- a/app/views/layouts/_mailbot_footer.html.erb
+++ b/app/views/layouts/_mailbot_footer.html.erb
@@ -1,12 +1,7 @@
-<html lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <meta content="width=device-width, initial-scale=1" name="viewport"/>
-    <meta content="Snap!Con -- A conference all about Snap!, a programing language from UC Berkeley." name="description"/>
-    <meta content="Michael Ball, Brian Harvey, Jens Moenig, Bernat Romagosa, Dan Garcia, Lauren Mock" name="author"/>
-    <%= stylesheet_link_tag "mailbot" %>
-  </head>
-  <body>
-  <div id="border" style="background-color: <%= conference_color(@conference) %>"></div>
+    <% if @conference.present? %>
+      <div id="border" style="background-color: <%= conference_color(@conference) %>">
+    <% else %>
+      <div id="border" style="background-color: #003262">
+    <% end %>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/app/views/layouts/_mailbot_header.html.erb b/app/views/layouts/_mailbot_header.html.erb
index 12f9d4a5..f3c33bd8 100644
--- a/app/views/layouts/_mailbot_header.html.erb
+++ b/app/views/layouts/_mailbot_header.html.erb
@@ -9,17 +9,21 @@
     <meta content="Michael Ball, Brian Harvey, Jens Moenig, Bernat Romagosa, Dan Garcia, Lauren Mock" name="author"/>
     <%= stylesheet_link_tag "mailbot" %>
   </head>
-  <body> 
-    <div id="border" style="background-color: <%= conference_color(@conference) %>">
+
+  <body>
+
+    <% if @conference.present? %>
+      <div id="border" style="background-color: <%= conference_color(@conference) %>">
+    <% else %>
+      <div id="border" style="background-color: #003262">
+    <% end %>
       <div class="row">
         <div class="col-md-2">
           <% if @conference.present? %>
             <%= image_tag(conference_logo_url(@conference), style: "display:block;height:70px;width:auto;", alt: @conference.title + ' logo') %>
+          <% else %>
+            <%= image_tag(Organization.first.picture_url, style: "display:block;height:70px;width:auto;", alt: ENV['OSEM_NAME'] + ' logo') %>
           <% end %>
         </div>
       </div>
     </div>
-  </body>
-
-
-           
\ No newline at end of file
