diff --git a/app/assets/javascripts/meeting.coffee b/app/assets/javascripts/meeting.coffee
index 4e678031..6f93c046 100644
--- a/app/assets/javascripts/meeting.coffee
+++ b/app/assets/javascripts/meeting.coffee
@@ -26,8 +26,7 @@ class @Meeting
     if _meetingInstance
       return _meetingInstance
     meetingId = $(".page-wrapper").data('id')
-    if (type = location.pathname.split('/')[1]) != 'rooms'
-      type = 'meetings'
+    type = $("body").data('resource')
     name = $('.meeting-user-name').val()
     adminId = $(".page-wrapper").data('admin-id')
     _meetingInstance = new Meeting(meetingId, type, name, adminId)
@@ -42,9 +41,9 @@ class @Meeting
       fullId = encodeURIComponent(adminId) + '/' + encodeURIComponent(meetingId)
     else
       fullId = encodeURIComponent(meetingId)
-    return @buildFullDomainURL() + '/' + type + '/' + fullId
+    return @buildRootURL() + '/' + type + '/' + fullId
 
-  @buildFullDomainURL: ->
+  @buildRootURL: ->
     url = location.protocol + '//' + location.hostname
     if location.port
       url += ':' + location.port
diff --git a/app/assets/javascripts/recordings.coffee b/app/assets/javascripts/recordings.coffee
index d984c848..24c8814c 100644
--- a/app/assets/javascripts/recordings.coffee
+++ b/app/assets/javascripts/recordings.coffee
@@ -238,7 +238,7 @@ class @Recordings
 
   getRecordingsURL: ->
     if $(".page-wrapper.rooms").data('main-room')
-      base_url = '/rooms/'+Meeting.getInstance().getAdminId()
+      base_url = Meeting.buildRootURL()+'/'+$('body').data('resource')+'/'+Meeting.getInstance().getAdminId()
     else
       base_url = $('.meeting-url').val()
     base_url+'/recordings'
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index bacfc69a..01bdb262 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -43,6 +43,10 @@ module ApplicationHelper
     end
   end
 
+  def omniauth_login_url(provider)
+    "/auth/#{provider}"
+  end
+
   # Whether the current page is the page of a room/meeting or not
   def on_room_or_meeting_page?
     params[:id].present?
diff --git a/app/views/landing/_rooms_center_panel.html.erb b/app/views/landing/_rooms_center_panel.html.erb
index 5cb7de7b..39b6618a 100644
--- a/app/views/landing/_rooms_center_panel.html.erb
+++ b/app/views/landing/_rooms_center_panel.html.erb
@@ -38,7 +38,7 @@
     <% else %>
       <div class="text-center">
         <div><%= t('are_you', name: @user.name) %></div>
-        <div class=""><%= link_to t('login'), '/users/login' %></div>
+        <div class=""><%= link_to t('login'), user_login_url %></div>
       </div>
     <% end %>
   </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 1cd6131b..fe415073 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -26,7 +26,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
     <link href="https://fonts.googleapis.com/css?family=Roboto:400,700" rel="stylesheet">
   </head>
 
-  <body class="app-background" data-controller="<%= params[:controller] %>" data-action="<%= params[:action] %>">
+  <body class="app-background" data-controller="<%= params[:controller] %>" data-action="<%= params[:action] %>" data-resource="<%= params[:resource] %>">
     <!-- Messages -->
     <div id='alerts'>
     </div>
diff --git a/app/views/sessions/new.erb b/app/views/sessions/new.erb
index 5128d45c..5b5694b4 100644
--- a/app/views/sessions/new.erb
+++ b/app/views/sessions/new.erb
@@ -26,7 +26,7 @@
       <%= render layout: 'shared/center_panel' do %>
         <div class="center-block center-panel-content-size col-xs-12">
           <% if omniauth_providers_configured(:twitter) %>
-            <%= link_to '/auth/twitter', class: "signin-link signin-link-twitter" do %>
+            <%= link_to omniauth_login_url(:twitter), class: "signin-link signin-link-twitter" do %>
               <div class="signin-button center-block">
                 <div class="signin-icon-wrapper">
                   <%= image_tag("twitter_signin_logo.png", alt: "T", class: "signin-icon") %>
@@ -38,7 +38,7 @@
             <% end %>
           <% end %>
           <% if omniauth_providers_configured(:google) %>
-              <%= link_to '/auth/google', class: "signin-link signin-link-google" do %>
+              <%= link_to omniauth_login_url(:google), class: "signin-link signin-link-google" do %>
                 <div class="signin-button center-block">
                   <div class="signin-icon-wrapper">
                     <%= image_tag("g-normal.png", alt: "G", class: "signin-icon") %>
diff --git a/app/views/shared/_signup.html.erb b/app/views/shared/_signup.html.erb
index 4747abc8..ec304f38 100644
--- a/app/views/shared/_signup.html.erb
+++ b/app/views/shared/_signup.html.erb
@@ -26,7 +26,7 @@
   <% else %>
     <div class="text-center">
       <span><%= t('login_description') %></span>
-      <div><%= link_to t('login'), '/users/login' %></div>
+      <div><%= link_to t('login'), user_login_url %></div>
     </div>
   <% end %>
 </span>
diff --git a/config/routes.rb b/config/routes.rb
index c2d446c1..83bb56d1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -19,7 +19,7 @@ Rails.application.routes.draw do
   mount ActionCable.server => '/cable'
 
   resources :users, only: [:edit, :update]
-  get '/users/login', to: 'sessions#new'
+  get '/users/login', to: 'sessions#new', as: :user_login
   get '/users/logout', to: 'sessions#destroy', as: :user_logout
 
   match '/auth/:provider/callback', to: 'sessions#create', via: [:get, :post]
@@ -28,24 +28,24 @@ Rails.application.routes.draw do
   # There are two resources [meetings|rooms]
   # meetings offer a landing page for NON authenticated users to create and join session in BigBlueButton
   # rooms offer a customized landing page for authenticated users to create and join session in BigBlueButton
-  scope '/:resource' do
+  scope '/:resource', constraints: {resource: /meetings|rooms/} do
+
+    # room specific routes
     scope '/:room_id' do
       # recording routes for updating, deleting and viewing recordings
       get '/(:id)/recordings', to: 'bbb#recordings', defaults: {id: nil, format: 'json'}
       patch '/(:id)/recordings/:record_id', to: 'bbb#update_recordings', defaults: {id: nil, format: 'json'}
       delete '/(:id)/recordings/:record_id', to: 'bbb#delete_recordings', defaults: {id: nil, format: 'json'}
 
-      # room specific routes
       delete '/:id/end', to: 'bbb#end', defaults: {format: 'json'}
       get '/:id/wait', to: 'landing#wait_for_moderator'
       get '/:id/session_status_refresh', to: 'landing#session_status_refresh'
     end
 
     # routes shared between meetings and rooms
-    get '/(:room_id)/:id', to: 'landing#resource', defaults: {room_id: nil}
     get '/(:room_id)/:id/join', to: 'bbb#join', defaults: {room_id: nil, format: 'json'}
+    get '/(:room_id)/:id', to: 'landing#resource', as: :meeting_room, defaults: {room_id: nil}
     post '/:id/callback', to: 'bbb#callback' #, defaults: {format: 'json'}
-
   end
 
   root to: 'landing#index', :resource => 'meetings'
diff --git a/docker-compose.yml b/docker-compose.yml
index 1d97afdf..229621e6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,6 +10,8 @@ services:
       - '.:/usr/src/app'
     volumes_from:
       - gem_cache
+    env_file:
+      - .env
     expose:
       - '3001'
     stdin_open: true
