diff --git a/src/upgrades/1.10.2/username_email_history.js b/src/upgrades/1.10.2/username_email_history.js
index 2407c72ce2..69c48be82a 100644
--- a/src/upgrades/1.10.2/username_email_history.js
+++ b/src/upgrades/1.10.2/username_email_history.js
@@ -28,7 +28,7 @@ module.exports = {
 								user.getUserFields(uid, ['username', 'joindate'], next);
 							},
 							(userdata, next) => {
-								if (!userdata) {
+								if (!userdata || !userdata.joindate) {
 									return setImmediate(next);
 								}
 
@@ -49,7 +49,7 @@ module.exports = {
 								user.getUserFields(uid, ['email', 'joindate'], next);
 							},
 							(userdata, next) => {
-								if (!userdata) {
+								if (!userdata || !userdata.joindate) {
 									return setImmediate(next);
 								}