diff --git a/src/user/data.js b/src/user/data.js
index 920c19086b..88e2e3caaf 100644
--- a/src/user/data.js
+++ b/src/user/data.js
@@ -154,8 +154,12 @@ module.exports = function (User) {
 
 			if (user.hasOwnProperty('username')) {
 				let showfullname = parseInt(meta.config.showfullname, 10) === 1;
-				if (uidToSettings[user.uid] && parseInt(uidToSettings[user.uid].showfullname, 10) === 0) {
-					showfullname = false;
+				if (uidToSettings[user.uid]) {
+					if (parseInt(uidToSettings[user.uid].showfullname, 10) === 0) {
+						showfullname = false;
+					} else if (parseInt(uidToSettings[user.uid].showfullname, 10) === 1) {
+						showfullname = true;
+					}
 				}
 
 				user.displayname = validator.escape(String(