diff --git a/src/js/app-config.js b/src/js/app-config.js
index 8e8ec38..603d7fc 100644
--- a/src/js/app-config.js
+++ b/src/js/app-config.js
@@ -13,7 +13,7 @@ module.exports = appCfg;
  */
 appCfg.config = {
     cloudUrl: 'https://keys.whiteout.io',
-    hkpUrl: 'https://pgp.mit.edu',
+    hkpUrl: 'http://keyserver.ubuntu.com',
     privkeyServerUrl: 'https://keychain.whiteout.io',
     adminUrl: 'https://admin-node.whiteout.io',
     settingsUrl: 'https://settings.whiteout.io/autodiscovery/',
diff --git a/src/js/controller/app/publickey-import.js b/src/js/controller/app/publickey-import.js
index 77a1488..1094b42 100644
--- a/src/js/controller/app/publickey-import.js
+++ b/src/js/controller/app/publickey-import.js
@@ -20,7 +20,7 @@ var PublickeyImportCtrl = function($scope, $q, keychain, pgp, hkp, dialog, appCo
     // scope variables
     //
 
-    $scope.hkpUrl = appConfig.config.hkpUrl.replace('https://', '');
+    $scope.hkpUrl = appConfig.config.hkpUrl.replace(/http[s]?:\/\//, '');
 
     //
     // scope functions
diff --git a/src/js/crypto/pgp.js b/src/js/crypto/pgp.js
index 75df80f..b805cf4 100644
--- a/src/js/crypto/pgp.js
+++ b/src/js/crypto/pgp.js
@@ -28,8 +28,8 @@ PGP.prototype.generateKeys = function(options) {
         }
 
         // generate keypair
-        name = options.realname ? options.realname.replace(/[&\/\\#,+()$~%.'":*?<>{}]/g, '').trim() + ' ' : '';
-        userId = name + '<' + options.emailAddress + '>';
+        name = options.realname ? options.realname.replace(/[&\/\\#,+()$~%.'":*?<>{}]/g, '').trim() : '';
+        userId = name + ' <' + options.emailAddress + '>';
         passphrase = (options.passphrase) ? options.passphrase : undefined;
 
         resolve({
diff --git a/test/unit/crypto/pgp-test.js b/test/unit/crypto/pgp-test.js
index d8e5c98..4225255 100644
--- a/test/unit/crypto/pgp-test.js
+++ b/test/unit/crypto/pgp-test.js
@@ -86,6 +86,10 @@ describe('PGP Crypto Api unit tests', function() {
                     publicKeyArmored: keys.publicKeyArmored
                 });
             }).then(function() {
+                var keyParams = pgp.getKeyParams();
+                expect(keyParams.userIds[0].name).to.equal('');
+                expect(keyParams.userIds[0].emailAddress).to.equal(user);
+
                 return pgp.encrypt('secret', [keyObject.publicKeyArmored]);
             }).then(function(ct) {
                 expect(ct).to.exist;
@@ -117,7 +121,9 @@ describe('PGP Crypto Api unit tests', function() {
                     publicKeyArmored: keys.publicKeyArmored
                 });
             }).then(function() {
-                expect(pgp.getKeyParams().userIds[0].name).to.equal('Jon Doe');
+                var keyParams = pgp.getKeyParams();
+                expect(keyParams.userIds[0].name).to.equal('Jon Doe');
+                expect(keyParams.userIds[0].emailAddress).to.equal(user);
 
                 return pgp.encrypt('secret', [keyObject.publicKeyArmored]);
             }).then(function(ct) {
@@ -150,7 +156,9 @@ describe('PGP Crypto Api unit tests', function() {
                     publicKeyArmored: keys.publicKeyArmored
                 });
             }).then(function() {
-                expect(pgp.getKeyParams().userIds[0].name).to.equal('Jon Doe');
+                var keyParams = pgp.getKeyParams();
+                expect(keyParams.userIds[0].name).to.equal('Jon Doe');
+                expect(keyParams.userIds[0].emailAddress).to.equal(user);
 
                 return pgp.encrypt('secret', [keyObject.publicKeyArmored]);
             }).then(function(ct) {