diff --git a/app/assets/javascripts/recordings.coffee b/app/assets/javascripts/recordings.coffee
index 4605b88c..2992b888 100644
--- a/app/assets/javascripts/recordings.coffee
+++ b/app/assets/javascripts/recordings.coffee
@@ -169,6 +169,10 @@ class @Recordings
     options.selector = '.disabled-tooltip'
     options.title = I18n.youtube_disabled
     $('#recordings').tooltip(options)
+    
+    options.selector = '.invalid-tooltip'
+    options.title = I18n.invalid_provider
+    $('#recordings').tooltip(options)
 
     $(document).one "turbolinks:before-cache", =>
       @getTable().api().clear().draw().destroy()
@@ -371,8 +375,10 @@ class @Recordings
         canUpload = res_data['uploadable']
       )
 
-      if canUpload
+      if canUpload == 'true'
         $(this).attr('data-popover-body', '.mail_youtube_popover')
+      else if canUpload == 'invalid_provider'
+        $(this).attr('data-popover-body', '.no_youtube_popover')
       else
         $(this).attr('data-popover-body', '.mail_popover')
 
diff --git a/app/controllers/bbb_controller.rb b/app/controllers/bbb_controller.rb
index e9758675..6abc6840 100644
--- a/app/controllers/bbb_controller.rb
+++ b/app/controllers/bbb_controller.rb
@@ -201,10 +201,12 @@ class BbbController < ApplicationController
 
   # POST /rooms/:room_id/recordings/can_upload
   def can_upload
-    # The recording is uploadable if it contains webcam data and they are logged in thorugh Google.
-    uploadable = Faraday.head(get_webcams_url(params[:rec_id])).status == 200 &&
-                 Rails.application.config.omniauth_google &&
-                 current_user.provider == 'google'
+    # The recording is uploadable if it contains webcam data and they are logged in through Google.
+    if current_user.provider != 'google'
+      uploadable = 'invalid_provider' 
+    else
+      uploadable = (Faraday.head(get_webcams_url(params[:rec_id])).status == 200 && current_user.provider == 'google').to_s
+    end
     render json: {:uploadable => uploadable}
   end
 
diff --git a/app/views/landing/rooms.html.erb b/app/views/landing/rooms.html.erb
index a1dda2b7..e714ef50 100644
--- a/app/views/landing/rooms.html.erb
+++ b/app/views/landing/rooms.html.erb
@@ -99,6 +99,16 @@
       </button>
     </div>
   </div>
+  <div class='no_youtube_popover'>
+    <button type="button" class="btn btn-default mail-recording mail-tooltip fa-2x">
+      <%= icon('envelope-o') %>
+    </button>
+    <div class="tooltip-wrapper disabled invalid-tooltip">
+      <button type="button" class="btn btn-default" disabled>
+          <%= icon('youtube-play') %>
+      </button>
+    </div>
+  </div>
   <div class="recording-visibility-popover">
     <button type="button" class="btn btn-default btn-success recording-update" data-visibility="published">
       <%= t('client.published') %>
diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml
index 623476dc..28d8da1f 100644
--- a/config/locales/en-us.yml
+++ b/config/locales/en-us.yml
@@ -51,6 +51,7 @@ en-US:
     email_footer_1: This e-mail is auto-generated by your friendly neighbourhood BigBlueButton server. Do no reply to this e-mail.
     email_footer_2: BigBlueButton is an open source web conferencing system. For more information on BigBlueButton and it's amazing capabilities, see https://bigbluebutton.org/ .
     enter_name: Enter a name to join
+    invalid_provider: You must authenticate with Google to upload.
     mail_recording: Mail
     meeting_ended: Meeting was ended
     meeting_started: Meeting was started