diff --git a/app/views/landing/meetings.html.erb b/app/views/landing/meetings.html.erb
index 60a42c3c..244acfe9 100644
--- a/app/views/landing/meetings.html.erb
+++ b/app/views/landing/meetings.html.erb
@@ -22,11 +22,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 <% content_for :footer do %>
   <div class="panel-footer">
     <div class="text-center">
-      <% if current_user %>
-        <%= link_to t('return_to_room'), current_user.room_url %>
-      <% else %>
-        <%= link_to t('create_your_session'), root_path %>
-      <% end %>
+      <%= link_to t('create_your_session'), root_path %>
     </div>
   </div>
 <% end %>
diff --git a/app/views/landing/rooms.html.erb b/app/views/landing/rooms.html.erb
index 03598804..f24e6217 100644
--- a/app/views/landing/rooms.html.erb
+++ b/app/views/landing/rooms.html.erb
@@ -30,10 +30,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
       <% end %>
     </div>
 
-    <% if !@main_room %>
-      <div class="row text-center">
-        <%= link_to(t('return_to_room'), current_user.room_url) %>
-      </div>
+    <% unless @main_room && !current_user %>
+      <%= render 'shared/signup' %>
     <% end %>
 
     <div class="table-wrapper">
diff --git a/app/views/shared/_signup.html.erb b/app/views/shared/_signup.html.erb
index b4085d12..087bfbd9 100644
--- a/app/views/shared/_signup.html.erb
+++ b/app/views/shared/_signup.html.erb
@@ -1,13 +1,17 @@
 <span class="signup">
   <% if current_user %>
   <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>
+    <% if @main_room %>
+      <span><%= t('logged_in_description_html', link: link_to(current_user.name, current_user.room_url)) %></span>
+    <% else %>
+      <%= link_to(t('return_to_room'), current_user.room_url) %>
+    <% end %>
+    <div><%= 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>
+      <span><%= t('login_description') %></span>
+      <div><%= link_to t('login'), '/users/login' %></div>
     </div>
   <% end %>
 </span>