diff --git a/cloud-init-templates/cloud_config_centos.jinja2 b/cloud-init-templates/cloud_config_centos.jinja2
index 7169962f..0e39ef91 100644
--- a/cloud-init-templates/cloud_config_centos.jinja2
+++ b/cloud-init-templates/cloud_config_centos.jinja2
@@ -67,6 +67,7 @@ mcollective:
     ttl: 4294957
     securityprovider: psk
     plugin.psk: {{ mcollective.pskey }}
+    identity: {{ mcollective.identity }}
 {% if mcollective.connector == 'stomp' %}
     connector = stomp
     plugin.stomp.host: {{ mcollective.host }}
diff --git a/cloud-init-templates/cloud_config_ubuntu.jinja2 b/cloud-init-templates/cloud_config_ubuntu.jinja2
index d683d146..b546290c 100644
--- a/cloud-init-templates/cloud_config_ubuntu.jinja2
+++ b/cloud-init-templates/cloud_config_ubuntu.jinja2
@@ -52,6 +52,7 @@ mcollective:
     ttl: 4294957
     securityprovider: psk
     plugin.psk: {{ mcollective.pskey }}
+    identity: {{ mcollective.identity }}
 {% if mcollective.connector == 'stomp' %}
     connector = stomp
     plugin.stomp.host: {{ mcollective.host }}
diff --git a/fuel_agent/drivers/nailgun.py b/fuel_agent/drivers/nailgun.py
index 2c26ad06..b59d3083 100644
--- a/fuel_agent/drivers/nailgun.py
+++ b/fuel_agent/drivers/nailgun.py
@@ -525,7 +525,8 @@ class Nailgun(BaseDataDriver):
             user=data['ks_meta']['mco_user'],
             password=data['ks_meta']['mco_password'],
             connector=data['ks_meta']['mco_connector'],
-            enable=data['ks_meta']['mco_enable']
+            enable=data['ks_meta']['mco_enable'],
+            identity=data['ks_meta']['mco_identity']
         )
 
         LOG.debug('Setting configdrive profile %s' % data['profile'])
diff --git a/fuel_agent/objects/configdrive.py b/fuel_agent/objects/configdrive.py
index 922991c1..13f30132 100644
--- a/fuel_agent/objects/configdrive.py
+++ b/fuel_agent/objects/configdrive.py
@@ -44,7 +44,8 @@ class ConfigDrivePuppet(object):
 
 
 class ConfigDriveMcollective(object):
-    def __init__(self, pskey, vhost, host, user, password, connector, enable):
+    def __init__(self, pskey, vhost, host, user, password, connector,
+                 enable, identity):
         self.pskey = pskey
         self.vhost = vhost
         self.host = host
@@ -52,6 +53,7 @@ class ConfigDriveMcollective(object):
         self.password = password
         self.connector = connector
         self.enable = enable
+        self.identity = identity
 
 
 class ConfigDriveScheme(object):
diff --git a/fuel_agent/tests/fixtures/simple_nailgun_driver.json b/fuel_agent/tests/fixtures/simple_nailgun_driver.json
index c3aeb63f..78bdac3a 100644
--- a/fuel_agent/tests/fixtures/simple_nailgun_driver.json
+++ b/fuel_agent/tests/fixtures/simple_nailgun_driver.json
@@ -60,6 +60,7 @@
         "mco_pskey": "unset",
         "mco_user": "mcollective",
         "mco_vhost": "mcollective",
+        "mco_identity": -1,
         "pm_data": {
             "kernel_params": "console=ttyS0,9600 console=tty0 rootdelay=90 nomodeset",
             "ks_spaces": []
diff --git a/fuel_agent/tests/test_configdrive.py b/fuel_agent/tests/test_configdrive.py
index ea876de6..c5afa739 100644
--- a/fuel_agent/tests/test_configdrive.py
+++ b/fuel_agent/tests/test_configdrive.py
@@ -63,7 +63,7 @@ class TestConfigDriveScheme(unittest2.TestCase):
             'timezone', {'repo1': 'repo1_url', 'repo2': 'repo2_url'}, 'gw')
         cd_puppet = configdrive.ConfigDrivePuppet('master', 0)
         cd_mcollective = configdrive.ConfigDriveMcollective(
-            'pskey', 'vhost', 'host', 'user', 'password', 'connector', 1)
+            'pskey', 'vhost', 'host', 'user', 'password', 'connector', 1, -1)
         self.cd_scheme.common = cd_common
         self.cd_scheme.puppet = cd_puppet
         self.cd_scheme.mcollective = cd_mcollective
diff --git a/fuel_agent/tests/test_nailgun.py b/fuel_agent/tests/test_nailgun.py
index e4fcdb60..d395e67c 100644
--- a/fuel_agent/tests/test_nailgun.py
+++ b/fuel_agent/tests/test_nailgun.py
@@ -99,6 +99,7 @@ PROVISION_SAMPLE_DATA = {
         },
         "timezone": "America/Los_Angeles",
         "master_ip": "10.20.0.2",
+        "mco_identity": -1,
         "mco_enable": 1,
         "mco_vhost": "mcollective",
         "mco_pskey": "unset",