diff --git a/packages/embark/src/cmd/cmd_controller.js b/packages/embark/src/cmd/cmd_controller.js
index ad6a9f3c3..b9ca057d5 100644
--- a/packages/embark/src/cmd/cmd_controller.js
+++ b/packages/embark/src/cmd/cmd_controller.js
@@ -174,6 +174,7 @@ class EmbarkController {
         engine.registerModuleGroup("filewatcher");
         engine.registerModuleGroup("storage");
         engine.registerModuleGroup("communication");
+        engine.registerModuleGroup("cockpit");
         engine.registerModulePackage('embark-deploy-tracker', {plugins: engine.plugins});
 
         engine.events.on('deployment:deployContracts:afterAll', () => {
diff --git a/packages/embark/src/lib/core/engine.js b/packages/embark/src/lib/core/engine.js
index 021998742..33f3ed2f1 100644
--- a/packages/embark/src/lib/core/engine.js
+++ b/packages/embark/src/lib/core/engine.js
@@ -86,7 +86,8 @@ class Engine {
       "storage": this.storageComponent,
       "communication": this.communicationComponents,
       "filewatcher": this.filewatcherService,
-      "tests": this.testComponents
+      "tests": this.testComponents,
+      cockpit: this.cockpitModules
     };
 
     let group = groups[groupName];
@@ -367,6 +368,11 @@ class Engine {
     this.registerModulePackage('embark-api', {plugins: this.plugins});
   }
 
+  cockpitModules() {
+    this.registerModulePackage('embark-authenticator', {singleUseAuthToken: this.singleUseAuthToken});
+    this.registerModulePackage('embark-api', {plugins: this.plugins});
+  }
+
   webServerService() {
     this.registerModulePackage('embark-webserver');
   }