diff --git a/app/controllers/bbb_controller.rb b/app/controllers/bbb_controller.rb
index 3a3c9c11..9e50f497 100644
--- a/app/controllers/bbb_controller.rb
+++ b/app/controllers/bbb_controller.rb
@@ -8,7 +8,7 @@ class BbbController < ApplicationController
     elsif ( !params.has_key?(:name) )
       render_response("missing_parameter", "user name was not included", :bad_request)
     else
-      bbb_join_url = helpers.bbb_join_url(params[:id], false, params[:name], false, )
+      bbb_join_url = helpers.bbb_join_url(params[:id], false, params[:name], false, "#{request.base_url}/#{params[:resource]}/#{params[:id]}")
       if bbb_join_url[:returncode]
         logger.info "#Execute the redirect"
         render_response("ok", "execute the redirect", :ok, {:join_url => bbb_join_url[:join_url]})
diff --git a/app/controllers/landing_controller.rb b/app/controllers/landing_controller.rb
index d2ac0059..3d770fa2 100644
--- a/app/controllers/landing_controller.rb
+++ b/app/controllers/landing_controller.rb
@@ -3,6 +3,7 @@ class LandingController < ApplicationController
   def meeting
     @refreshable = (params[:resource] == 'meetings' && !params.has_key?(:id))
     @meeting_token = params[:id] || @meeting_token = helpers.new_meeting_token
+    @resource = params[:resource]
     @resource_url = meeting_url(@meeting_token)
   end
 
@@ -16,9 +17,10 @@ class LandingController < ApplicationController
 
   def room
     @room_name = params[:name]
-    @meeting_token = @room_name
-    @resource_url = room_url(@meeting_token)
     @user = User.find_by(username: @room_name)
+    @meeting_token = @room_name
+    @resource = params[:resource]
+    @resource_url = room_url(@meeting_token)
     if @user.nil?
       redirect_to root_path
     end
diff --git a/app/views/landing/_join_form.html.erb b/app/views/landing/_join_form.html.erb
index 0e55c48b..51e7c13e 100644
--- a/app/views/landing/_join_form.html.erb
+++ b/app/views/landing/_join_form.html.erb
@@ -22,7 +22,7 @@
         <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>
       </div>
-      <button id="join_form_button" type="button" class="btn btn-success" data-url="<%= bbb_join_path(@meeting_token) %>">Join</button>
+      <button id="join_form_button" type="button" class="btn btn-success" data-url="<%= bbb_join_path(@resource, @meeting_token) %>">Join</button>
     </form>
   </div>
 </div>
diff --git a/config/routes.rb b/config/routes.rb
index eb01cbbd..e051a894 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
-  get 'bbb/join/:id', to: 'bbb#join', as: :bbb_join
+  get 'bbb/join/:resource/:id', to: 'bbb#join', as: :bbb_join
 
   get '/meetings/new', to: 'landing#new_meeting', as: :new_meeting
   get '/meetings(/:id)', to: 'landing#meeting', as: :meeting, :resource => "meetings"