diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 0618be52..c9db5c23 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -39,8 +39,8 @@
         <%= render :partial => 'search/quick_search', :locals => {:search_term => @question} %>
       </div>
 
-      <% if User.current.logged? || !Setting.login_required? %>
       <ul id="account-nav">
+        <% if User.current.logged? || !Setting.login_required? %>
         <% main_top_menu_items.each do |item| %>
             <%= render_menu_node(item) %>
         <% end %>
@@ -75,7 +75,8 @@
           </ul>
         </li>
         <% end %>
-          <%= render_menu_node(help_menu_item) %>
+        <%= render_menu_node(help_menu_item) %>
+        <% end %>
           <% unless User.current.logged? %>
             <% if Setting.self_registration? %>
             <li>
@@ -99,7 +100,6 @@
             </li>
           <% end %>
       </ul>
-      <% end %>
     </div>
     </div>
     <div id="breadcrumb">
diff --git a/test/integration/account_test.rb b/test/integration/account_test.rb
index 9365ba52..6f356c65 100644
--- a/test/integration/account_test.rb
+++ b/test/integration/account_test.rb
@@ -101,6 +101,15 @@ class AccountTest < ActionController::IntegrationTest
     assert_equal 0, Token.count
   end
 
+  def test_self_register_link_present
+    Setting.self_registration = '3'
+    Setting.login_required = '1'
+
+    get "/"
+    follow_redirect!
+    assert_select "a[href*=?]", "/account/register", :text => "Register"
+  end
+
   def test_register_with_automatic_activation
     Setting.self_registration = '3'