diff --git a/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/pom.xml
index 30e7afbbd..634fc4647 100644
--- a/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/pom.xml
@@ -32,6 +32,10 @@
     <url>http://wso2.org</url>
 
     <dependencies>
+		<dependency>
+			<groupId>commons-codec.wso2</groupId>
+			<artifactId>commons-codec</artifactId>
+		</dependency>
         <dependency>
             <groupId>org.wso2.carbon.analytics-common</groupId>
             <artifactId>org.wso2.carbon.event.input.adapter.core</artifactId>
diff --git a/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/MQTTEventAdapter.java b/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/MQTTEventAdapter.java
index 767153902..f6b80dc79 100644
--- a/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/MQTTEventAdapter.java
+++ b/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/MQTTEventAdapter.java
@@ -42,7 +42,6 @@ public class MQTTEventAdapter implements InputEventAdapter {
     private MQTTAdapterListener mqttAdapterListener;
     private MQTTBrokerConnectionConfiguration mqttBrokerConnectionConfiguration;
 
-
     public MQTTEventAdapter(InputEventAdapterConfiguration eventAdapterConfiguration,
                             Map<String, String> globalProperties) {
         this.eventAdapterConfiguration = eventAdapterConfiguration;
diff --git a/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/MQTTAdapterListener.java b/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/MQTTAdapterListener.java
index 802295862..b710a4aa5 100644
--- a/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/MQTTAdapterListener.java
+++ b/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/MQTTAdapterListener.java
@@ -267,18 +267,25 @@ public class MQTTAdapterListener implements MqttCallback, Runnable {
 
     private String getToken(String clientId, String clientSecret)
             throws UserStoreException, JWTClientException {
-        String scopes = mqttBrokerConnectionConfiguration.getBrokerScopes();
-        String username = mqttBrokerConnectionConfiguration.getUsername();
-        if (mqttBrokerConnectionConfiguration.isGlobalCredentailSet()) {
-            username = PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                    .getUserRealm().getRealmConfiguration().getAdminUserName() + "@" + PrivilegedCarbonContext
-                    .getThreadLocalCarbonContext().getTenantDomain(true);
-        }
+        PrivilegedCarbonContext.startTenantFlow();
+        PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(tenantId, true);
+        try {
+            String scopes = mqttBrokerConnectionConfiguration.getBrokerScopes();
+            String username = mqttBrokerConnectionConfiguration.getUsername();
+            if (mqttBrokerConnectionConfiguration.isGlobalCredentailSet()) {
+                username = PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                        .getUserRealm().getRealmConfiguration().getAdminUserName() + "@" + PrivilegedCarbonContext
+                        .getThreadLocalCarbonContext().getTenantDomain(true);
+            }
 
-        JWTClientManagerService jwtClientManagerService = InputAdapterServiceDataHolder.getJwtClientManagerService();
-        AccessTokenInfo accessTokenInfo = jwtClientManagerService.getJWTClient().getAccessToken(
-                clientId, clientSecret, username, scopes);
-        return accessTokenInfo.getAccessToken();
+            JWTClientManagerService jwtClientManagerService =
+                    InputAdapterServiceDataHolder.getJwtClientManagerService();
+            AccessTokenInfo accessTokenInfo = jwtClientManagerService.getJWTClient().getAccessToken(
+                    clientId, clientSecret, username, scopes);
+            return accessTokenInfo.getAccessToken();
+        } finally {
+            PrivilegedCarbonContext.endTenantFlow();
+        }
     }
 
     private String getBase64Encode(String key, String value) {
diff --git a/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/MQTTEventAdapterConstants.java b/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/MQTTEventAdapterConstants.java
index 657ac99eb..dc0e45413 100644
--- a/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/MQTTEventAdapterConstants.java
+++ b/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/MQTTEventAdapterConstants.java
@@ -53,7 +53,7 @@ public class MQTTEventAdapterConstants {
 
     public static final String EMPTY_STRING = "";
     public static final String GRANT_TYPE_PARAM_NAME = "grant_type";
-    public static final String GRANT_TYPE = "password refresh_token";
+    public static final String GRANT_TYPE = "password refresh_token urn:ietf:params:oauth:grant-type:jwt-bearer";
     public static final String TOKEN_SCOPE = "production";
     public static final String APPLICATION_NAME_PREFIX = "InputAdapter_";
     public static final String CLIENT_ID = "clientId";
diff --git a/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/RegistrationProfile.java b/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/RegistrationProfile.java
index f5445f170..d531aa038 100644
--- a/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/RegistrationProfile.java
+++ b/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/RegistrationProfile.java
@@ -67,7 +67,7 @@ public class RegistrationProfile {
 		String jsonString =
 				"{\"callbackUrl\": \"" + callbackUrl + "\",\"clientName\": \"" + clientName + "\", \"tokenScope\": " +
 						"\"" + tokenScope + "\", \"owner\": \"" + owner + "\"," + "\"grantType\": \"" + grantType +
-						"\", \"saasApp\" :false }\n";
+						"\", \"saasApp\" :true }\n";
 		return jsonString;
 	}
 }
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 27e371288..04c05eca3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -793,6 +793,11 @@
             <!--<artifactId>commons-codec</artifactId>-->
             <!--<version>${commons-codec.wso2.version}</version>-->
             <!--</dependency>-->
+			<dependency>
+				<groupId>commons-codec.wso2</groupId>
+				<artifactId>commons-codec</artifactId>
+				<version>${commons-codec.version.wso2}</version>
+			</dependency>
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
@@ -1179,7 +1184,7 @@
 
 
         <orbit.version.commons-httpclient>3.1.0.wso2v2</orbit.version.commons-httpclient>
-        <!--<commons-codec.wso2.version>1.4.0.wso2v1</commons-codec.wso2.version>-->
+        <commons-codec.version.wso2>1.4.0.wso2v1</commons-codec.version.wso2>
         <commons-codec.version>1.7</commons-codec.version>
 
         <javaee-web-api.version>6.0</javaee-web-api.version>