diff --git a/Roadmap.md b/Roadmap.md
index bd500584c..c94c45658 100644
--- a/Roadmap.md
+++ b/Roadmap.md
@@ -4,6 +4,7 @@ Some of the improvements planned for the next versions of Telescope. Email [hell
 
 [Fixing issues](https://github.com/TelescopeJS/Telescope/issues) is also a great way to pitch in :)
 
+- Get rid of default user account dropdown. 
 - Better user profiles. 
 - Better user dashboard (with search).
 - Implement real reactive joins.
diff --git a/client/views/nav/nav.js b/client/views/nav/nav.js
index a55481018..dbe5b4c92 100644
--- a/client/views/nav/nav.js
+++ b/client/views/nav/nav.js
@@ -31,13 +31,9 @@ Template[getTemplate('nav')].helpers({
   }
 });
 
-Template[getTemplate('nav')].rendered=function(){
-
-  if(!Meteor.user()){
+Template[getTemplate('nav')].rendered = function(){
+  if(!Meteor.loggingIn() && !Meteor.user()){
     $('.login-link-text').text("Sign Up/Sign In");
-  }else{
-    $('#login-buttons-logout').before('<a href="/users/'+Meteor.user().slug+'" class="account-link button">View Profile</a>');
-    $('#login-buttons-logout').before('<a href="/account" class="account-link button">Edit Account</a>');
   }
 };
 
@@ -53,5 +49,11 @@ Template[getTemplate('nav')].events({
   'click .login-header': function(e){
     e.preventDefault();
     Router.go('/account');
+  },
+  'click #login-name-link': function(e){
+    if(Meteor.user() && !$('account-link').exists()){
+      $('#login-buttons-logout').before('<a href="/users/'+Meteor.user().slug+'" class="account-link button">View Profile</a>');
+      $('#login-buttons-logout').before('<a href="/account" class="account-link button">Edit Account</a>');
+    }  
   }
 });
\ No newline at end of file