diff --git a/src/index.html b/src/index.html
index f6bfccd..40e39c5 100644
--- a/src/index.html
+++ b/src/index.html
@@ -40,6 +40,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
                             <option value="la">Louisiana</option>
                             <option value="mt">Montana</option>
                         </select>
+                        Email address: <input class="form-control" type="email" id="notary_email" />
                         Location (county/residing at): <input class="form-control" type="text" id="notary_location" />
                         Commission expiration: <input class="form-control" type="text" id="notary_expires" />
                         Commission number: <input class="form-control" type="text" id="notary_idnumber" />
diff --git a/src/js/crypto.js b/src/js/crypto.js
index dee03f2..08252ca 100644
--- a/src/js/crypto.js
+++ b/src/js/crypto.js
@@ -21,7 +21,7 @@ function loadKeyFromLocalStorage(callback) {
     $("#lockstatus").css("display", "none");
     if (!inStorage("signingkey") || getStorage("signingkey") == "undefined") {
         showPasswordPrompt("Generating a new signing key (might take a while, be patient). Enter a password to protect it. You'll need to save this password somewhere safe; it cannot be recovered.", function (pass) {
-            generatePrivateKey(getStorage("notary_name") + " <null@null.com>", pass, function (key) {
+            generatePrivateKey(getStorage("notary_name") + " <" + (inStorage("notary_email") ? getStorage("notary_email") : "null@null.com") + ">", pass, function (key) {
                 if (typeof key == "undefined") {
                     callback("Could not generate key.", false);
                     return;
diff --git a/src/js/settings.js b/src/js/settings.js
index 98b6fd1..0d5f5fe 100644
--- a/src/js/settings.js
+++ b/src/js/settings.js
@@ -6,8 +6,9 @@
  */
 
 
-function setupNotaryOptions(name, location, expires, idnumber, state) {
+function setupNotaryOptions(name, email, location, expires, idnumber, state) {
     setStorage("notary_name", name);
+    setStorage("notary_email", email.trim().toLowerCase());
     setStorage("notary_location", location);
     setStorage("notary_expires", expires);
     setStorage("notary_idnumber", idnumber);
@@ -16,6 +17,7 @@ function setupNotaryOptions(name, location, expires, idnumber, state) {
 
 function openSettingsModal() {
     $("#settingsModal #notary_name").val(getStorage("notary_name"));
+    $("#settingsModal #notary_email").val(getStorage("notary_email"));
     $("#settingsModal #notary_location").val(getStorage("notary_location"));
     $("#settingsModal #notary_expires").val(getStorage("notary_expires"));
     $("#settingsModal #notary_idnumber").val(getStorage("notary_idnumber"));
@@ -41,6 +43,7 @@ function openSettingsModal() {
 function saveSettingsModal() {
     setupNotaryOptions(
             $("#settingsModal #notary_name").val(),
+            $("#settingsModal #notary_email").val(),
             $("#settingsModal #notary_location").val(),
             $("#settingsModal #notary_expires").val(),
             $("#settingsModal #notary_idnumber").val(),