diff --git a/app/views/layouts/_branding.html.erb b/app/views/layouts/_branding.html.erb
index 6f8dc01..e262438 100644
--- a/app/views/layouts/_branding.html.erb
+++ b/app/views/layouts/_branding.html.erb
@@ -24,7 +24,7 @@
     <!-- Collect the nav links, forms, and other content for toggling -->
     <div class="collapse navbar-collapse" id="org-navbar-menu">
       <!-- Organisational links -->
-      <% if user_signed_in? && !current_user.org.present? && !current_user.org.links.present? && !current_user.org.links['org'].present? %>
+      <% if user_signed_in? and !current_user.org.links.nil? and !current_user.org.links['org'].blank? %>
         <ul class="nav navbar-nav">
           <% i=1; current_user.org.links['org'].each do |link| %>
             <% if !link.blank? && i <= max_number_links %>
@@ -43,7 +43,7 @@
           <% if !current_user.org.contact_email.blank? %>
             <%= mail_to current_user.org.contact_email, :class => 'org-a' do %>
               <i class="fa fa-envelope" aria-hidden="true">&nbsp;</i>
-              <%= current_user.org.contact_name %>
+              <%= current_user.org.contact_name ? current_user.org.contact_name : current_user.org.contact_email %>
             <% end %>
           <% end %>
         </ul>