diff --git a/index.js b/index.js
index aca7159..2dcf151 100644
--- a/index.js
+++ b/index.js
@@ -176,7 +176,7 @@ module.exports.create = function (config) {
   // Return null (not undefined) on success, or throw on error
   store.accounts.setKeypair = function (opts) {
     //console.log('accounts.setKeypair for', opts.account, opts.email, opts.keypair);
-    var id = opts.account.id || 'single-user';
+    var id = opts.account.id || opts.email || 'single-user';
 
     // you can just treat the keypair as opaque and save and retrieve it as JSON
     var keyblob = JSON.stringify({
diff --git a/test.js b/test.js
new file mode 100644
index 0000000..c70566b
--- /dev/null
+++ b/test.js
@@ -0,0 +1,27 @@
+'use strict';
+
+var tester = require('greenlock-store-test');
+
+var crypto = require('crypto');
+var os = require('os');
+var path = require('path');
+var basedir = path.join(os.tmpdir(), 'greenlock-store-fs-test-' + crypto.randomBytes(4).toString('hex'));
+var domain = '*.example.com';
+var store = require('./').create({
+  configDir: basedir
+, accountsDir: path.join(basedir, 'accounts')
+, privkeyPath: path.join(basedir, 'live', domain, 'privkey.pem')
+, fullchainPath: path.join(basedir, 'live', domain, 'fullchain.pem')
+, certPath: path.join(basedir, 'live', domain, 'cert.pem')
+, chainPath: path.join(basedir, 'live', domain, 'chain.pem')
+, bundlePath: path.join(basedir, 'live', domain, 'bundle.pem')
+});
+console.info('Test Dir:', basedir);
+
+tester.test(store).then(function () {
+  console.info("PASS");
+}).catch(function (err) {
+  console.error("FAIL");
+  console.error(err);
+  process.exit(20);
+});