diff --git a/domain/auth/ldap/ldap.go b/domain/auth/ldap/ldap.go
index 61b464f3..7c8d4297 100644
--- a/domain/auth/ldap/ldap.go
+++ b/domain/auth/ldap/ldap.go
@@ -212,11 +212,6 @@ func extractUser(c lm.LDAPConfig, e *ld.Entry) (u lm.LDAPUser) {
 	u.RemoteID = e.GetAttributeValue(c.AttributeUserRDN)
 	u.CN = e.GetAttributeValue("cn")
 
-	// Make name elements from DisplayName if we can.
-	if (len(u.Firstname) == 0 || len(u.Firstname) == 0) &&
-		len(e.GetAttributeValue(c.AttributeUserDisplayName)) > 0 {
-	}
-
 	if len(u.Firstname) == 0 {
 		u.Firstname = "LDAP"
 	}
@@ -251,13 +246,13 @@ func convertUsers(c lm.LDAPConfig, lu []lm.LDAPUser) (du []user.User) {
 // ConvertUser turns LDAP user into Documize user.
 func convertUser(c lm.LDAPConfig, lu lm.LDAPUser) (du user.User) {
 	du = user.User{}
-	du.Editor = c.DefaultPermissionAddSpace
 	du.Active = true
-	du.Email = lu.Email
 	du.ViewUsers = false
 	du.Analytics = false
 	du.Admin = false
 	du.Global = false
+	du.Editor = c.DefaultPermissionAddSpace
+	du.Email = lu.Email
 	du.Firstname = lu.Firstname
 	du.Lastname = lu.Lastname
 	du.Initials = stringutil.MakeInitials(lu.Firstname, lu.Lastname)
diff --git a/gui/app/templates/components/customize/auth-settings.hbs b/gui/app/templates/components/customize/auth-settings.hbs
index 7fd01c9e..b01aeb99 100644
--- a/gui/app/templates/components/customize/auth-settings.hbs
+++ b/gui/app/templates/components/customize/auth-settings.hbs
@@ -169,7 +169,7 @@
 				<label for="ldap-groupFilter" class="col-sm-3 col-form-label">Group Filter</label>
 				<div class="col-sm-9">
 					{{input id="ldap-groupFilter" type="text" value=ldapConfig.groupFilter class=(if ldapErrorNoFilter 'form-control is-invalid' 'form-control')}}
-					<small class="form-text text-muted">Search filter for finding users via groups, e.g. (&(objectClass=group)(|(cn=ship_crew)(cn=admin_staff))</small>
+					<small class="form-text text-muted">Search filter for finding users via groups, e.g. (&(objectClass=group)(|(cn=ship_crew)(cn=admin_staff)))</small>
 				</div>
 			</div>
 
@@ -248,7 +248,7 @@
 				{{else}}
 					<p class="text-success">Connection successful, found {{ldapPreview.count}} users.</p>
 					{{#each ldapPreview.users as |user|}}
-						<p>{{user.firstname}} {{user.firstname}} ({{user.email}})</p>
+						<p>{{user.firstname}} {{user.lastname}} ({{user.email}})</p>
 					{{/each}}
 				{{/if}}
 			</div>