diff --git a/static/js/admin.js b/static/js/admin.js
index a8a90a4e14..13a3b0e83a 100644
--- a/static/js/admin.js
+++ b/static/js/admin.js
@@ -59,6 +59,7 @@ function _setup_page() {
realm_icon_source: page_params.realm_icon_source,
realm_icon_url: page_params.realm_icon_url,
realm_mandatory_topics: page_params.realm_mandatory_topics,
+ realm_send_welcome_emails: page_params.realm_send_welcome_emails,
};
var admin_tab = templates.render('admin_tab', options);
diff --git a/static/js/server_events_dispatch.js b/static/js/server_events_dispatch.js
index 83e9f39593..f2df484dc2 100644
--- a/static/js/server_events_dispatch.js
+++ b/static/js/server_events_dispatch.js
@@ -70,6 +70,7 @@ exports.dispatch_normal_event = function dispatch_normal_event(event) {
name: notifications.redraw_title,
name_changes_disabled: settings_org.toggle_name_change_display,
notifications_stream_id: noop,
+ send_welcome_emails: noop,
signup_notifications_stream_id: noop,
restricted_to_domain: noop,
waiting_period_threshold: noop,
diff --git a/static/js/settings_org.js b/static/js/settings_org.js
index 37a5e71c75..c74de04fcc 100644
--- a/static/js/settings_org.js
+++ b/static/js/settings_org.js
@@ -281,6 +281,11 @@ function _set_up() {
type: 'text',
msg: i18n.t("Default language changed!"),
},
+ send_welcome_emails: {
+ type: 'bool',
+ checked_msg: i18n.t("Send emails to new users explaining how to use Zulip!"),
+ unchecked_msg: i18n.t("Don't send emails to new users explaining how to use Zulip!"),
+ },
allow_message_deleting: {
type: 'bool',
checked_msg: i18n.t("Users can delete their messages!"),
diff --git a/static/templates/settings/organization-settings-admin.handlebars b/static/templates/settings/organization-settings-admin.handlebars
index 1e72f1f160..d195bbbabe 100644
--- a/static/templates/settings/organization-settings-admin.handlebars
+++ b/static/templates/settings/organization-settings-admin.handlebars
@@ -3,6 +3,7 @@
+
@@ -133,6 +134,16 @@
{{/each}}
+
+
+
+
{{#if is_admin }}