diff --git a/app/assets/stylesheets/landing.scss b/app/assets/stylesheets/landing.scss
index 6d592f1d..06900393 100644
--- a/app/assets/stylesheets/landing.scss
+++ b/app/assets/stylesheets/landing.scss
@@ -21,10 +21,6 @@
     width: 200px;
     padding: 0;
   }
-  .login-text {
-    font-size: 16px;
-    padding-right: 5px;
-  }
 }
 
 .rooms {
diff --git a/app/views/landing/index.html.erb b/app/views/landing/index.html.erb
index 43844364..f83f4f9c 100644
--- a/app/views/landing/index.html.erb
+++ b/app/views/landing/index.html.erb
@@ -41,9 +41,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
     </div>
 
     <div class="center-block col-xs-6 login">
-      <div class="text-center">
-        <span class="login-text"><%= t('login_description') %></span> <%= link_to 'Login', '/users/login', class: 'btn btn-lg btn-primary' %>
-      </div>
+      <%= render 'shared/signup' %>
     </div>
 
   </div>
diff --git a/app/views/landing/meetings.html.erb b/app/views/landing/meetings.html.erb
index 68ba27a8..60a42c3c 100644
--- a/app/views/landing/meetings.html.erb
+++ b/app/views/landing/meetings.html.erb
@@ -43,5 +43,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
       <% end %>
     </div>
 
+    <%= render 'shared/signup' %>
+
   </div>
 </div>
diff --git a/app/views/landing/rooms.html.erb b/app/views/landing/rooms.html.erb
index 6edf3f77..1fc84c05 100644
--- a/app/views/landing/rooms.html.erb
+++ b/app/views/landing/rooms.html.erb
@@ -26,6 +26,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
       <%= render 'rooms_center_panel' %>
     </div>
 
+    <%= render 'shared/signup' %>
+
     <div class="table-wrapper">
       <table id="recordings" class="table" width="100%">
         <thead>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index ca6114c9..1db824d3 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -36,9 +36,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>
-      <% unless params[:controller] == 'sessions' && params[:action] == 'new' %>
-        <%= render 'shared/signup' %>
-      <% end %>
     </div>
     <!-- End of Header -->
 
diff --git a/app/views/shared/_signup.html.erb b/app/views/shared/_signup.html.erb
index 0530e157..b4085d12 100644
--- a/app/views/shared/_signup.html.erb
+++ b/app/views/shared/_signup.html.erb
@@ -1,13 +1,13 @@
-<span class="signup pull-right">
+<span class="signup">
   <% 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}" %>
+  <div class="text-center">
+    <span class=""><%= t('logged_in_description_html', link: link_to(current_user.name, current_user.room_url)) %></span>
+    <div class=""><%= link_to t('logout'), user_logout_url %></div>
+  </div>
+  <% else %>
+    <div class="text-center">
+      <span class=""><%= t('login_description') %></span>
+      <div class=""><%= link_to t('login'), '/users/login' %></div>
+    </div>
   <% end %>
 </span>
diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml
index ceb2652d..92989d73 100644
--- a/config/locales/en-us.yml
+++ b/config/locales/en-us.yml
@@ -71,7 +71,9 @@ en-US:
   join_session: Join the current meeting
   join_session_id: Join %{id}
   join_session_user: Join %{name} meeting
+  logged_in_description_html: You are logged in as %{link}
   login: login
+  login_description: Want your own recorded meetings?
   logout: logout
   meeting_invite:
     explanation: Send an email with an invitation to this meeting
@@ -97,7 +99,6 @@ en-US:
   return_to_room: Return to your personal room
   session_url_explanation: The meeting will be taking place using the following URL
   signin_text: Log in with %{provider}
-  login_description: Login for customized sessions
   start: Start
   start_meeting: Start Meeting
   your_personal_room: Your Personal Room