diff --git a/app/views/shared/user_menu.rhtml b/app/views/shared/user_menu.rhtml
index b7209e1..37de1ba 100644
--- a/app/views/shared/user_menu.rhtml
+++ b/app/views/shared/user_menu.rhtml
@@ -58,19 +58,17 @@
 
   <% else %>
 
-    <% if theme_option( :menu_login ) == 'full_form' %>
-
-      <%= render :file => 'account/login_block' %>
-
-    <% else # theme_option( :menu_login ) != 'full_form' %>
-
-      <%= thickbox_inline_popup_link('<span class="icon-menu-login"></span>'+ _('Login'), 'inlineLoginBox', :id => 'link_login', :help => _('Click here to enter your username and password and be recognized by the system.')) %>
-      <div id='inlineLoginBox' style='display: none;'>
-        <%= render :file => 'account/login' %>
-        <center><%= thickbox_close_button _('Close') %></center>
-      </div>
-
-    <% end # theme_option( :menu_login ) != 'full_form' %>
+    <% if params[:controller] != 'account' || params[:action] != 'signup' %>
+      <% if theme_option( :menu_login ) == 'full_form' %>
+        <%= render :file => 'account/login_block' %>
+      <% else %>
+        <%= thickbox_inline_popup_link('<span class="icon-menu-login"></span>'+ _('Login'), 'inlineLoginBox', :id => 'link_login', :help => _('Click here to enter your username and password and be recognized by the system.')) %>
+        <div id='inlineLoginBox' style='display: none;'>
+          <%= render :file => 'account/login' %>
+          <center><%= thickbox_close_button _('Close') %></center>
+        </div>
+      <% end %>
+    <% end %>
 
   <% end %>
 
diff --git a/features/signup.feature b/features/signup.feature
new file mode 100644
index 0000000..3fafcd0
--- /dev/null
+++ b/features/signup.feature
@@ -0,0 +1,17 @@
+Feature: signup
+  As a new user
+  I want to sign up to the site
+  So I can have fun using its features
+
+  Scenario: successfull registration
+    Given I am on the homepage
+    When I follow "Login"
+    And I follow "I want to participate"
+    And I fill in "e-Mail" with "ze@example.com"
+    And I fill in "Username" with "ze"
+    And I fill in "Password" with "secret"
+    And I fill in "Password confirmation" with "secret"
+    And I fill in "Full name" with "José da Silva"
+    And I press "Sign up"
+    Then I should see "Thanks for signing up!"
+
--
libgit2 0.21.2