diff --git a/erizo_controller/erizoController/erizoController.js b/erizo_controller/erizoController/erizoController.js
index 9800419af3..1d20709cc1 100644
--- a/erizo_controller/erizoController/erizoController.js
+++ b/erizo_controller/erizoController/erizoController.js
@@ -16,6 +16,7 @@ GLOBAL.config.erizoController.publicIP = GLOBAL.config.erizoController.publicIP
 GLOBAL.config.erizoController.hostname = GLOBAL.config.erizoController.hostname|| '';
 GLOBAL.config.erizoController.port = GLOBAL.config.erizoController.port || 8080;
 GLOBAL.config.erizoController.ssl = GLOBAL.config.erizoController.ssl || false;
+GLOBAL.config.erizoController.listen_ssl = GLOBAL.config.erizoController.listen_ssl || false;
 GLOBAL.config.erizoController.turnServer = GLOBAL.config.erizoController.turnServer || undefined;
 if (config.erizoController.turnServer !== undefined) {
     GLOBAL.config.erizoController.turnServer.url = GLOBAL.config.erizoController.turnServer.url || '';
@@ -40,7 +41,8 @@ var getopt = new Getopt([
   ['i' , 'publicIP=ARG'               , 'Erizo Controller\'s public IP'],
   ['H' , 'hostname=ARG'               , 'Erizo Controller\'s hostname'],
   ['p' , 'port'                       , 'Port where Erizo Controller will listen to new connections.'],
-  ['S' , 'ssl'                        , 'Erizo Controller\'s hostname'],
+  ['S' , 'ssl'                        , 'Enable SSL for clients'],
+  ['s' , 'listen_ssl'                 , 'Enable HTTPS in server'],
   ['T' , 'turn-url'                   , 'Turn server\'s URL.'],
   ['U' , 'turn-username'              , 'Turn server\'s username.'],
   ['P' , 'turn-password'              , 'Turn server\'s password.'],
@@ -90,7 +92,7 @@ var log = logger.getLogger("ErizoController");
 
 var server;
 
-if (GLOBAL.config.erizoController.ssl) {
+if (GLOBAL.config.erizoController.listen_ssl) {
     var https = require('https');
     var fs = require('fs');
     var options = {
diff --git a/scripts/licode_default.js b/scripts/licode_default.js
index 1abea568c9..8bc423e388 100644
--- a/scripts/licode_default.js
+++ b/scripts/licode_default.js
@@ -53,6 +53,8 @@ config.erizoController.hostname = ''; //default value: ''
 config.erizoController.port = 8080; //default value: 8080
 // Use true if clients communicate with erizoController over SSL
 config.erizoController.ssl = false; //default value: false
+// Use true if erizoController listens in HTTPS. SSL certificates located in /cert
+config.erizoController.listen_ssl = false; //default value: false
 
 // Use the name of the inferface you want to bind to for websockets
 // config.erizoController.networkInterface = 'eth1' // default value: undefined