diff --git a/bigbluebutton-html5/imports/api/users-settings/server/methods/addUserSettings.js b/bigbluebutton-html5/imports/api/users-settings/server/methods/addUserSettings.js
index ca1f20e2e05ef220b70a531869b9aee48e642438..b0c11aebbb501c86d91be34e48121d080362bc27 100644
--- a/bigbluebutton-html5/imports/api/users-settings/server/methods/addUserSettings.js
+++ b/bigbluebutton-html5/imports/api/users-settings/server/methods/addUserSettings.js
@@ -59,6 +59,7 @@ const currentParameters = [
   'bbb_auto_swap_layout',
   'bbb_hide_presentation',
   'bbb_show_participants_on_login',
+  'bbb_show_public_chat_on_login',
   // OUTSIDE COMMANDS
   'bbb_outside_toggle_self_voice',
   'bbb_outside_toggle_recording',
diff --git a/bigbluebutton-html5/imports/startup/client/base.jsx b/bigbluebutton-html5/imports/startup/client/base.jsx
index 48bcc57099752eb43b096687171321c1ee2ce971..4a4bf7a75e04080d3ea6c5d433ba81f41a9fafbc 100755
--- a/bigbluebutton-html5/imports/startup/client/base.jsx
+++ b/bigbluebutton-html5/imports/startup/client/base.jsx
@@ -356,9 +356,9 @@ const BaseContainer = withTracker(() => {
 
   if (getFromUserSettings('bbb_show_participants_on_login', true) && !deviceInfo.type().isPhone) {
     Session.set('openPanel', 'userlist');
-    if (CHAT_ENABLED) {
-      //Session.set('openPanel', 'chat');
-      //Session.set('idChatOpen', PUBLIC_CHAT_ID);
+    if (CHAT_ENABLED && getFromUserSettings('bbb_show_public_chat_on_login', true)) {
+      Session.set('openPanel', 'chat');
+      Session.set('idChatOpen', PUBLIC_CHAT_ID);
     }
   } else {
     Session.set('openPanel', '');