diff --git a/exec/logon.js b/exec/logon.js
index 03070fd2e8d953b33249de4a22a47b0ae3ce2ba6..0fbd5ce19199721dc63fd419cc07f001a4851604 100644
--- a/exec/logon.js
+++ b/exec/logon.js
@@ -39,17 +39,25 @@ if(user.security.restrictions&UFLAG_G) {
 		email=console.getstr(LEN_NETMAIL);
 		if(!email || !email.length)
 			continue;
+		if(bbs.trashcan("email", email)) {
+			bbs.hangup();
+			exit();
+		}
 		bbs.log_str("  " + email);
 		user.netmail=email;
 		user.settings|=USER_NETMAIL;
 		break;
 	}
-		
+
 	while(bbs.online) {
 		printf("\1y\1hPlease enter your location (City, State): \1w");
 		location=console.getstr(LEN_LOCATION,K_UPRLWR);
 		if(!location || !location.length)
 			continue;
+		if(bbs.trashcan("location", email)) {
+			bbs.hangup();
+			exit();
+		}
 		bbs.log_str("  " + location);
 		user.location=location;
 		break;