[FIX] Check settings for name requirement before validating

app/lib/server/functions/saveUser.js

@@ -171,19 +171,17 @@ export const saveUser = function(userId, userData) {
 
 		const _id = Accounts.createUser(createUser);
 
-		// set userData.name to empty string to guarantee it's not undefined
-		if (!userData.name) {
-			userData.name = '';
-		}
-
 		const updateUser = {
 			$set: {
-				name: userData.name,
 				roles: userData.roles || ['user'],
 				settings: userData.settings || {},
 			},
 		};
 
+		if (typeof userData.name !== 'undefined') {
+			updateUser.$set.name = userData.name;
+		}
+
 		if (typeof userData.requirePasswordChange !== 'undefined') {
 			updateUser.$set.requirePasswordChange = userData.requirePasswordChange;
 		}
@@ -203,12 +201,15 @@ export const saveUser = function(userId, userData) {
 				subject,
 				html,
 				data: {
-					name: s.escapeHTML(userData.name),
 					email: s.escapeHTML(userData.email),
 					password: s.escapeHTML(userData.password),
 				},
 			};
 
+			if (typeof userData.name !== 'undefined') {
+				email.data.name = s.escapeHTML(userData.name);
+			}
+
 			try {
 				Mailer.send(email);
 			} catch (error) {

app/lib/server/functions/setRealName.js

@@ -20,7 +20,11 @@ export const _setRealName = function(userId, name) {
 	}
 
 	// Set new name
-	Users.setName(user._id, name);
+	if (name) {
+		Users.setName(user._id, name);
+	} else {
+		Users.unsetName(user._id);
+	}
 	user.name = name;
 
 	// if user has no username, there is no need to updated any direct messages (there is none)

app/models/server/models/Subscriptions.js

@@ -1188,11 +1188,20 @@ export class Subscriptions extends Base {
 			name,
 		};
 
-		const update = {
-			$set: {
-				fname,
-			},
-		};
+		let update;
+		if (fname) {
+			update = {
+				$set: {
+					fname,
+				},
+			};
+		} else {
+			update = {
+				$unset: {
+					fname: true,
+				},
+			};
+		}
 
 		return this.update(query, update, { multi: true });
 	}

app/models/server/models/Users.js

@@ -741,6 +741,16 @@ export class Users extends Base {
 		return this.update(_id, update);
 	}
 
+	unsetName(_id) {
+		const update = {
+			$unset: {
+				name,
+			},
+		};
+
+		return this.update(_id, update);
+	}
+
 	setCustomFields(_id, fields) {
 		const values = {};
 		Object.keys(fields).forEach((key) => {