diff --git a/app/models/member_profile.rb b/app/models/member_profile.rb
index e92cea7..bcaf514 100644
--- a/app/models/member_profile.rb
+++ b/app/models/member_profile.rb
@@ -23,6 +23,8 @@ class MemberProfile
   paginates_per 10
 
   def name
-  	"#{self.first_name} #{self.last_name}"
+    if self.first_name || self.last_name
+  	 "#{self.first_name} #{self.last_name}"
+    end
   end
 end
diff --git a/app/views/orbit_bar/index.html.erb b/app/views/orbit_bar/index.html.erb
index d80ee33..dd053fe 100644
--- a/app/views/orbit_bar/index.html.erb
+++ b/app/views/orbit_bar/index.html.erb
@@ -90,7 +90,7 @@
         </li>
         <% if !current_user.nil? %>
           <li>
-            <span id="user"><%= current_user.member_profile.nil? ? current_user.user_name : current_user.member_profile.name %></span>
+            <span id="user"><%= current_user.member_profile.name.nil? ? current_user.user_name : current_user.member_profile.name %></span>
             <ul>
               <li>
                 <a href="/logout"><i class="icons-logout"></i><%= t(:logout) %></a>