diff --git a/src/user/create.js b/src/user/create.js
index 2edc676c33..a25595ba5f 100644
--- a/src/user/create.js
+++ b/src/user/create.js
@@ -55,7 +55,7 @@ module.exports = function (User) {
 
 		const bulkAdd = [
 			['username:uid', userData.uid, userData.username],
-			['user:' + userData.uid + ':usernames', timestamp, userData.username],
+			['user:' + userData.uid + ':usernames', timestamp, userData.username + ':' + timestamp],
 			['username:sorted', 0, userData.username.toLowerCase() + ':' + userData.uid],
 			['userslug:uid', userData.uid, userData.userslug],
 			['users:joindate', timestamp, userData.uid],
diff --git a/test/user.js b/test/user.js
index ca4ce837a2..fa0b271404 100644
--- a/test/user.js
+++ b/test/user.js
@@ -1137,17 +1137,12 @@ describe('User', function () {
 		});
 
 
-		it('should get history from set', function (done) {
-			var now = Date.now();
-			db.sortedSetAdd('user:' + testUid + ':usernames', now, 'derp:' + now, function (err) {
-				assert.ifError(err);
-				User.getHistory('user:' + testUid + ':usernames', function (err, data) {
-					assert.ifError(err);
-					assert.equal(data[0].value, 'derp');
-					assert.equal(data[0].timestamp, now);
-					done();
-				});
-			});
+		it('should get history from set', async function () {
+			const now = Date.now();
+			await db.sortedSetAdd('user:' + testUid + ':usernames', now, 'derp:' + now);
+			const data = await User.getHistory('user:' + testUid + ':usernames');
+			assert.equal(data[0].value, 'derp');
+			assert.equal(data[0].timestamp, now);
 		});
 
 		it('should return the correct ban reason', function (done) {