diff --git a/app/views/forum_topics/_secondary_links.html.erb b/app/views/forum_topics/_secondary_links.html.erb
index b2bee9146..c1cb794d7 100644
--- a/app/views/forum_topics/_secondary_links.html.erb
+++ b/app/views/forum_topics/_secondary_links.html.erb
@@ -5,7 +5,7 @@
<%= link_to "Search", search_forum_posts_path %>
<%= link_to "Mark all as read", mark_all_as_read_forum_topics_path, :method => :post %>
<%= link_to "Help", wiki_pages_path(:title => "help:forum") %>
- <% if @forum_topic %>
+ <% if @forum_topic && !@forum_topic.new_record? %>
|
<%= link_to "Reply", new_forum_post_path(:topic_id => @forum_topic.id) %>
<% if !@forum_topic.new_record? && @forum_topic.editable_by?(CurrentUser.user) %>
diff --git a/app/views/users/_secondary_links.html.erb b/app/views/users/_secondary_links.html.erb
index c9c7857e0..5030efc8d 100644
--- a/app/views/users/_secondary_links.html.erb
+++ b/app/views/users/_secondary_links.html.erb
@@ -5,7 +5,7 @@
<% if CurrentUser.is_anonymous? %>
<%= link_to "Sign up", new_user_path %>
<% end %>
- <% if @user && !CurrentUser.is_anonymous? %>
+ <% if @user && !@user.new_record? && !CurrentUser.is_anonymous? %>
|
<% if @user.id == CurrentUser.id %>
<%= link_to "Settings", edit_user_path(CurrentUser.user) %>
diff --git a/app/views/wiki_pages/_secondary_links.html.erb b/app/views/wiki_pages/_secondary_links.html.erb
index 47fbc3f85..90b3820eb 100644
--- a/app/views/wiki_pages/_secondary_links.html.erb
+++ b/app/views/wiki_pages/_secondary_links.html.erb
@@ -4,7 +4,7 @@
<%= link_to "Search", search_wiki_pages_path %>
<%= link_to "New", new_wiki_page_path %>
<%= link_to "Help", wiki_pages_path(:search => {:title => "help:wiki"}) %>
- <% if @wiki_page %>
+ <% if @wiki_page && !@wiki_page.new_record? %>
|
<%= link_to "Posts (#{Post.fast_count(@wiki_page.title)})", posts_path(:tags => @wiki_page.title) %>
<%= link_to "History", wiki_page_versions_path(:search => {:wiki_page_id => @wiki_page.id}) %>