diff --git a/src/models/pnid.ts b/src/models/pnid.ts
index e433581..2bfc6d8 100644
--- a/src/models/pnid.ts
+++ b/src/models/pnid.ts
@@ -352,6 +352,7 @@ PNIDSchema.method('scrub', async function scrub() {
 	this.email.reachable = false;
 	this.email.validated = false;
 	this.email.validated_date = '';
+	this.email.history.splice(0);
 	this.email.id = 0;
 	this.region = 0;
 	this.timezone.name = '';
diff --git a/src/services/nnas/routes/people.ts b/src/services/nnas/routes/people.ts
index 476ac9e..a94622b 100644
--- a/src/services/nnas/routes/people.ts
+++ b/src/services/nnas/routes/people.ts
@@ -735,6 +735,8 @@ router.put('/@me/emails/@primary', async (request: express.Request, response: ex
 		return;
 	}
 
+	pnid.email.history.unshift({ old: pnid.email.address, new: email.address.toLowerCase(), on: new Date() });
+
 	// TODO - Better email check
 	pnid.email.address = email.address.toLowerCase();
 	pnid.email.reachable = false;