diff --git a/lib/registry.js b/lib/registry.js
index 6319ae3..e47eea7 100644
--- a/lib/registry.js
+++ b/lib/registry.js
@@ -613,7 +613,7 @@ Registry.prototype.get = function get (name, cb) {
   if (name == '')
     args.push('/ve');
   else
-    args = args.concat(['/v', name]);
+    args = args.concat(['/v', '"' + name + '"']);
 
   pushArch(args, this.arch);
 
@@ -704,9 +704,13 @@ Registry.prototype.set = function set (name, type, value, cb) {
   if (name == '')
     args.push('/ve');
   else
-    args = args.concat(['/v', name]);
+    args = args.concat(['/v', '"' + name + '"']);
 
-  args = args.concat(['/t', type, '/d', value, '/f']);
+  args = args.concat(['/t', type]);
+  if (value !== '') {
+    args = args.concat(['/d', '"' + value + '"']);
+  }
+  args.push('/f');
 
   pushArch(args, this.arch);
 
@@ -758,7 +762,7 @@ Registry.prototype.remove = function remove (name, cb) {
   if (typeof cb !== 'function')
     throw new TypeError('must specify a callback');
 
-  var args = name ? ['DELETE', this.path, '/f', '/v', name] : ['DELETE', this.path, '/f', '/ve'];
+  var args = name ? ['DELETE', this.path, '/f', '/v', '"' + name + '"'] : ['DELETE', this.path, '/f', '/ve'];
 
   pushArch(args, this.arch);