diff --git a/src/cloudron.js b/src/cloudron.js
index 97d04e983..8f855deeb 100644
--- a/src/cloudron.js
+++ b/src/cloudron.js
@@ -24,11 +24,7 @@ exports = module.exports = {
     checkDiskSpace: checkDiskSpace,
 
     readDkimPublicKeySync: readDkimPublicKeySync,
-    refreshDNS: refreshDNS,
-
-    events: null,
-
-    EVENT_ACTIVATED: 'activated'
+    refreshDNS: refreshDNS
 };
 
 var appdb = require('./appdb.js'),
@@ -126,8 +122,6 @@ CloudronError.SELF_UPGRADE_NOT_SUPPORTED = 'Self upgrade not supported';
 function initialize(callback) {
     assert.strictEqual(typeof callback, 'function');
 
-    exports.events = new (require('events').EventEmitter)();
-
     gConfigState = { dns: false, tls: false, configured: false };
     gUpdatingDns = false;
     gBoxAndUserDetails = null;
@@ -144,8 +138,6 @@ function initialize(callback) {
 function uninitialize(callback) {
     assert.strictEqual(typeof callback, 'function');
 
-    exports.events = null;
-
     async.series([
         cron.uninitialize,
         mailer.stop,
@@ -322,7 +314,7 @@ function activate(username, password, email, displayName, ip, auditSource, callb
 
                 eventlog.add(eventlog.ACTION_ACTIVATE, auditSource, { });
 
-                exports.events.emit(exports.EVENT_ACTIVATED);
+                platform.createMailConfig(NOOP_CALLBACK); // bounces can now be sent to the cloudron owner
 
                 callback(null, { token: token, expires: expires });
             });
diff --git a/src/platform.js b/src/platform.js
index 3f8151f07..c2f0fb3be 100644
--- a/src/platform.js
+++ b/src/platform.js
@@ -2,13 +2,14 @@
 
 exports = module.exports = {
     start: start,
-    stop: stop
+    stop: stop,
+
+    createMailConfig: createMailConfig
 };
 
 var apps = require('./apps.js'),
     assert = require('assert'),
     async = require('async'),
-    cloudron = require('./cloudron.js'),
     config = require('./config.js'),
     certificates = require('./certificates.js'),
     debug = require('debug')('box:platform'),
@@ -45,8 +46,6 @@ function start(callback) {
         if (domain === '*.' + config.fqdn() || domain === config.adminFqdn()) startMail(NOOP_CALLBACK);
     });
 
-    cloudron.events.on(cloudron.EVENT_ACTIVATED, function () { createMailConfig(NOOP_CALLBACK); });
-
     var existingInfra = { version: 'none' };
     if (fs.existsSync(paths.INFRA_VERSION_FILE)) {
         existingInfra = safe.JSON.parse(fs.readFileSync(paths.INFRA_VERSION_FILE, 'utf8'));