diff --git a/lib/up-storage.js b/lib/up-storage.js
index f4c975511..897b44b79 100644
--- a/lib/up-storage.js
+++ b/lib/up-storage.js
@@ -7,7 +7,9 @@ var parse_interval = require('./config').parse_interval
 var Logger         = require('./logger')
 var MyStreams      = require('./streams')
 var Utils          = require('./utils')
-var encode         = encodeURIComponent
+var encode         = function(thing) {
+  return encodeURIComponent(thing).replace(/^%40/, '@');
+};
 
 module.exports = Storage