diff --git a/index.js b/index.js
index b90538d..66ffec1 100644
--- a/index.js
+++ b/index.js
@@ -108,7 +108,7 @@ router.post("/submit", (req, res) => {
 		}
 
 		let address = normalizeAddress(req.body.submitter);
-		let user = await lookupUser(req.body.submitter);
+		let user = await lookupUser(address);
 		let exists = await checkExistence(address, user.hostname);
 		
 		if (exists) {
diff --git a/normalize-address.js b/normalize-address.js
index dffcfaf..63ac01e 100644
--- a/normalize-address.js
+++ b/normalize-address.js
@@ -1,5 +1,5 @@
 "use strict";
 
 module.exports = function normalizeAddress(address) {
-	return address.replace(/^@/, "");
+	return address.replace(/^@/, "").trim();
 };