summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_settings/user_settings_general.jsx
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/components/user_settings/user_settings_general.jsx')
-rw-r--r--webapp/components/user_settings/user_settings_general.jsx4
1 files changed, 3 insertions, 1 deletions
diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx
index cc63e4fbf..07af50059 100644
--- a/webapp/components/user_settings/user_settings_general.jsx
+++ b/webapp/components/user_settings/user_settings_general.jsx
@@ -629,7 +629,9 @@ class UserSettingsGeneralTab extends React.Component {
if (this.props.activeSection === 'name') {
let extraInfo;
let submit = null;
- if (this.props.user.auth_service === '') {
+ if (this.props.user.auth_service === '' ||
+ (this.props.user.auth_service === 'ldap' &&
+ (global.window.mm_config.FirstNameAttributeSet === 'false' || global.window.mm_config.LastNameAttributeSet === 'false'))) {
inputs.push(
<div
key='firstNameSetting'