diff --git a/templates/main.js b/templates/main.js
index b0a96393..9ec0025f 100644
--- a/templates/main.js
+++ b/templates/main.js
@@ -105,7 +105,7 @@ function generatePassword() {
 
 function dopost(form) {
 	if (form.elements['name']) {
-		localStorage.name = form.elements['name'].value.replace(/ ##.+$/, '');
+		localStorage.name = form.elements['name'].value.replace(/( |^)## .+$/, '');
 	}
 	if (form.elements['email'] && form.elements['email'].value != 'sage') {
 		localStorage.email = form.elements['email'].value;