diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 01a1214e..12cc6c63 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -9,7 +9,7 @@ class UsersController < ApplicationController
   # PATCH/PUT /users/1.json
   def update
     if @user.update(user_params)
-      redirect_to controller: 'landing', action: 'room', name: @user.username
+      redirect_to controller: 'landing', action: 'room', id: @user.username
     else
       render :edit
     end
diff --git a/app/views/landing/_join_form.html.erb b/app/views/landing/_join_form.html.erb
index 9c7285d3..f3cf610f 100644
--- a/app/views/landing/_join_form.html.erb
+++ b/app/views/landing/_join_form.html.erb
@@ -18,10 +18,14 @@
   <!-- Join form -->
   <div id="landing_page_join">
     <form id="join_form" class="form-inline">
+      <% if current_user.nil? %>
       <div class="form-group">
         <label for="join_form_name" class="sr-only">Name</label>
-        <input id="join_form_name" type="text" class="form-control input" id="name" placeholder="Your name" required>
+        <input id="join_form_name" type="text" class="form-control input" placeholder="Your name" required>
       </div>
+      <% else %>
+        <input id="join_form_name" type="hidden" value="<%= current_user.name %>">
+      <% end %>
       <button id="join_form_button" type="button" class="btn btn-success" data-url="<%= bbb_join_path(@resource, @meeting_token) %>">Join</button>
     </form>
   </div>