diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 4cc52a0e..30566943 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -46,4 +46,14 @@ class ApplicationController < ActionController::Base
     USER_NAME_LIMIT
   end
   helper_method :user_name_limit
+
+  def user_name_limit
+    USER_NAME_LIMIT
+  end
+  helper_method :user_name_limit
+
+  def bigbluebutton_endpoint_default?
+    Rails.configuration.bigbluebutton_endpoint_default === Rails.configuration.bigbluebutton_endpoint
+  end
+  helper_method :bigbluebutton_endpoint_default?
 end
diff --git a/app/lib/bbb_api.rb b/app/lib/bbb_api.rb
index 4f279e1c..d0e3d89c 100644
--- a/app/lib/bbb_api.rb
+++ b/app/lib/bbb_api.rb
@@ -28,7 +28,7 @@ module BbbApi
   end
 
   def bbb
-    @bbb ||= BigBlueButton::BigBlueButtonApi.new(bbb_endpoint + "api", bbb_secret, "0.8", true)
+    @bbb ||= BigBlueButton::BigBlueButtonApi.new(bbb_endpoint + "api", bbb_secret, "0.8")
   end
 
   def bbb_meeting_id(id)
diff --git a/app/views/shared/_center_panel.html.erb b/app/views/shared/_center_panel.html.erb
index a83bd135..2b695326 100644
--- a/app/views/shared/_center_panel.html.erb
+++ b/app/views/shared/_center_panel.html.erb
@@ -18,6 +18,9 @@
     <div class="center-block center-panel-size col-xs-12">
       <div class="panel panel-default">
         <div class="panel-body">
+          <% if bigbluebutton_endpoint_default? %>
+          <div class="panel-alert alert alert-danger"><%= t('warning_bigbluebutton_endpoint_default') %></div>
+          <% end %>
           <h3 class="title-wrapper text-center">
             <%= yield :title %>
           </h3>
diff --git a/config/application.rb b/config/application.rb
index e44fd8b8..a2a05fb8 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -37,9 +37,12 @@ module Greenlight
     config.i18n.fallbacks = {'en' => 'en-US'}
 
     # BigBlueButton
-    config.bigbluebutton_endpoint = ENV['BIGBLUEBUTTON_ENDPOINT']  || 'http://test-install.blindsidenetworks.com/bigbluebutton/'
-    config.bigbluebutton_secret = ENV['BIGBLUEBUTTON_SECRET'] || '8cd8ef52e8e101574e400365b55e11a6'
+    config.bigbluebutton_endpoint_default = 'http://test-install.blindsidenetworks.com/bigbluebutton/'
+    config.bigbluebutton_secret_default = '8cd8ef52e8e101574e400365b55e11a6'
+    config.bigbluebutton_endpoint = ENV['BIGBLUEBUTTON_ENDPOINT']  || config.bigbluebutton_endpoint_default
+    config.bigbluebutton_secret = ENV['BIGBLUEBUTTON_SECRET'] || config.bigbluebutton_secret_default
 
+    # Greelight specific
     config.use_webhooks = ENV['GREENLIGHT_USE_WEBHOOKS'] && ENV['GREENLIGHT_USE_WEBHOOKS'] == "true"
     config.mail_notifications = ENV['GREENLIGHT_MAIL_NOTIFICATIONS'] && ENV['GREENLIGHT_MAIL_NOTIFICATIONS'] == "true"
     config.disable_guest_access = ENV['DISABLE_GUEST_ACCESS'] && ENV['DISABLE_GUEST_ACCESS'] == "true"
diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml
index c2c0fc36..c138193a 100644
--- a/config/locales/en-us.yml
+++ b/config/locales/en-us.yml
@@ -187,6 +187,7 @@ en-US:
   wait_for_mod_explanation: You will automatically join when the meeting starts
   watch: Watch
   'yes': 'Yes'
+  warning_bigbluebutton_endpoint_default: This deployment of Greenlight is making use of the BigBlueButton testing server that comes pre-configured by default. It should be replaced.
   welcome_to_greenlight: Welcome to GreenLight!
   youtube_description: This recording was recorded with BigBlueButton. For more information check out %{url}.
   youtube_footer: this will upload all webcam and audio data