diff --git a/app/views/landing/index.html.erb b/app/views/landing/index.html.erb
index e1b44c6c..7f84450b 100644
--- a/app/views/landing/index.html.erb
+++ b/app/views/landing/index.html.erb
@@ -40,5 +40,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
       <% end %>
     </div>
 
+    <%= render 'shared/signup' %>
+
   </div>
 </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 966aab86..38fdbedc 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -35,35 +35,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
       <span class="logo-wrapper pull-left">
         <%= link_to image_tag("bbb-logo.png", :alt => "BigBlueButton", :class => "logo"), root_path %>
       </span>
-      <span class="signup pull-right">
-        <% if current_user %>
-          <% if !@user %>
-            <%= link_to current_user.name, current_user.room_url %> |
-          <% else %>
-            <%= current_user.name %> |
-          <% end %>
-          <%= link_to t('logout'), user_logout_url %>
-        <% elsif @user %>
-          <%= t('are_you', name: @user.username) %> |
-          <%= link_to t('login'), "/auth/#{@user.provider}" %>
-        <% else %>
-          <% if omniauth_providers_configured.present? %>
-            <span class="signup-description hidden-xs">
-              <%= t('oauth_signup') %>
-            </span>
-          <% end %>
-          <% if omniauth_providers_configured(:twitter) %>
-            <%= link_to('/auth/twitter', :class => "btn icon btn-lg btn-social-icon btn-twitter") do %>
-              <span class="fa fa-twitter"></span>
-            <% end %>
-          <% end %>
-          <% if omniauth_providers_configured(:google) %>
-            <%= link_to('/auth/google', :class => "btn icon btn-lg btn-social-icon btn-google") do %>
-              <span class="fa fa-google"></span>
-            <% end %>
-          <% end %>
-        <% end %>
-      </span>
     </div>
     <!-- End of Header -->
 
diff --git a/app/views/shared/_signup.html.erb b/app/views/shared/_signup.html.erb
new file mode 100644
index 00000000..47ad8d01
--- /dev/null
+++ b/app/views/shared/_signup.html.erb
@@ -0,0 +1,29 @@
+<span class="signup pull-right">
+  <% if current_user %>
+    <% if !@user %>
+      <%= link_to current_user.name, current_user.room_url %> |
+    <% else %>
+      <%= current_user.name %> |
+    <% end %>
+    <%= link_to t('logout'), user_logout_url %>
+  <% elsif @user %>
+    <%= t('are_you', name: @user.username) %> |
+    <%= link_to t('login'), "/auth/#{@user.provider}" %>
+  <% else %>
+    <% if omniauth_providers_configured.present? %>
+      <span class="signup-description hidden-xs">
+        <%= t('oauth_signup') %>
+      </span>
+    <% end %>
+    <% if omniauth_providers_configured(:twitter) %>
+      <%= link_to('/auth/twitter', :class => "btn icon btn-lg btn-social-icon btn-twitter") do %>
+        <span class="fa fa-twitter"></span>
+      <% end %>
+    <% end %>
+    <% if omniauth_providers_configured(:google) %>
+      <%= link_to('/auth/google', :class => "btn icon btn-lg btn-social-icon btn-google") do %>
+        <span class="fa fa-google"></span>
+      <% end %>
+    <% end %>
+  <% end %>
+</span>