diff --git a/app/controllers/concerns/joiner.rb b/app/controllers/concerns/joiner.rb
index 6c6b016e..3021082c 100644
--- a/app/controllers/concerns/joiner.rb
+++ b/app/controllers/concerns/joiner.rb
@@ -84,11 +84,12 @@ module Joiner
 
   # Default, unconfigured meeting options.
   def default_meeting_options
-    invite_msg = I18n.t("invite_message")
+    moderator_message = "#{I18n.t('invite_message')}<br> #{request.base_url + room_path(@room)}"
+    moderator_message += "<br> #{I18n.t('modal.create_room.access_code')}: #{@room.access_code}" if @room.access_code.present?
     {
       user_is_moderator: false,
       meeting_logout_url: request.base_url + logout_room_path(@room),
-      moderator_message: "#{invite_msg}<br> #{request.base_url + room_path(@room)}",
+      moderator_message: moderator_message,
       host: request.host,
       recording_default_visibility: @settings.get_value("Default Recording Visibility") == "public"
     }
diff --git a/spec/concerns/joiner_spec.rb b/spec/concerns/joiner_spec.rb
new file mode 100644
index 00000000..9b4b2acd
--- /dev/null
+++ b/spec/concerns/joiner_spec.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
+#
+# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
+#
+# This program is free software; you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License as published by the Free Software
+# Foundation; either version 3.0 of the License, or (at your option) any later
+# version.
+#
+# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+
+require "rails_helper"
+
+describe Joiner do
+  let(:controller) { FakesController.new }
+
+  before do
+    class FakesController < ApplicationController
+      include Joiner
+      def init(room)
+        @room = room
+        @settings = Setting.all
+      end
+    end
+    @user = create(:user)
+    @room = @user.main_room
+    @room.uid = 'xxxx'
+    controller.init @room
+    controller.request = ActionController::TestRequest.create(FakesController)
+  end
+
+  after do
+    Object.send :remove_const, :FakesController
+  end
+
+  it "should properly configure moderator message with nil access code" do
+    expect(controller.default_meeting_options[:moderator_message]).not_to include('Access Code:')
+  end
+
+  it "should properly configure moderator message with empty access code" do
+    @room.access_code = ""
+    expect(controller.default_meeting_options[:moderator_message]).not_to include('Access Code:')
+  end
+
+  it "should properly configure moderator message with access code" do
+    @room.access_code = "1234"
+    expect(controller.default_meeting_options).to include(moderator_message: include('Access Code: 1234'))
+  end
+end