diff --git a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/util/APIUtil.java b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/util/APIUtil.java
index f5983c9df..dac6f2f49 100644
--- a/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/util/APIUtil.java
+++ b/components/iot-plugins/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/util/APIUtil.java
@@ -26,6 +26,7 @@ import org.wso2.carbon.user.api.UserStoreManager;
 import org.wso2.carbon.user.core.service.RealmService;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -176,21 +177,23 @@ public class APIUtil {
 		return deviceAccessAuthorizationService;
 	}
 
-
 	public static void registerApiAccessRoles(String user) {
 		UserStoreManager userStoreManager = null;
 		try {
 			userStoreManager = getUserStoreManager();
 			String[] userList = new String[]{user};
 			if (userStoreManager != null) {
+				String rolesOfUser[] = userStoreManager.getRoleListOfUser(user);
 				if (!userStoreManager.isExistingRole(Constants.DEFAULT_ROLE_NAME)) {
 					userStoreManager.addRole(Constants.DEFAULT_ROLE_NAME, userList, Constants.DEFAULT_PERMISSION);
+				} else if (rolesOfUser != null && Arrays.asList(rolesOfUser).contains(Constants.DEFAULT_ROLE_NAME)) {
+					return;
 				} else {
-					userStoreManager.updateUserListOfRole(Constants.DEFAULT_ROLE_NAME, null, userList);
+					userStoreManager.updateUserListOfRole(Constants.DEFAULT_ROLE_NAME, new String[0], userList);
 				}
 			}
 		} catch (UserStoreException e) {
-			log.error("Error while creating a role and adding a user for android_sense.", e);
+			log.error("Error while creating a role and adding a user for virtual_firealarm.", e);
 		}
 	}
 
diff --git a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java
index 0ecdde024..539b550cf 100644
--- a/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java
+++ b/components/iot-plugins/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java
@@ -22,6 +22,7 @@ import org.wso2.carbon.user.api.UserStoreManager;
 import org.wso2.carbon.user.core.service.RealmService;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -192,10 +193,13 @@ public class APIUtil {
 			userStoreManager = getUserStoreManager();
 			String[] userList = new String[]{user};
 			if (userStoreManager != null) {
+				String rolesOfUser[] = userStoreManager.getRoleListOfUser(user);
 				if (!userStoreManager.isExistingRole(Constants.DEFAULT_ROLE_NAME)) {
 					userStoreManager.addRole(Constants.DEFAULT_ROLE_NAME, userList, Constants.DEFAULT_PERMISSION);
+				} else if (rolesOfUser != null && Arrays.asList(rolesOfUser).contains(Constants.DEFAULT_ROLE_NAME)) {
+					return;
 				} else {
-					userStoreManager.updateUserListOfRole(Constants.DEFAULT_ROLE_NAME, null, userList);
+					userStoreManager.updateUserListOfRole(Constants.DEFAULT_ROLE_NAME, new String[0], userList);
 				}
 			}
 		} catch (UserStoreException e) {