diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/api/user-api.jag b/modules/distribution/src/repository/jaggeryapps/iotserver/api/user-api.jag
index f5c9c182..e965c1be 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/api/user-api.jag
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/api/user-api.jag
@@ -78,9 +78,9 @@ if (uriMatcher.match("/{context}/api/user/login/")) {
 	} else {
 		userRoles = String(addUserFormData.userRoles).split(",");
 	}
-	userRoles=["deviceRole, deviceUser"];
-	//TODO-Apply new users,
-	userRoles = [];
+
+	userRoles="deviceRole,deviceUser".split(",");
+
 	try {
 		result = userModule.registerUser(username, firstname, lastname, emailAddress, password,
 				userRoles);
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/modules/policy.js b/modules/distribution/src/repository/jaggeryapps/iotserver/modules/policy.js
index f1f45132..0e7d3f1e 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/modules/policy.js
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/modules/policy.js
@@ -23,8 +23,6 @@ policyModule = function () {
     var constants = require("/modules/constants.js");
     var utility = require("/modules/utility.js").utility;
 
-    var userManagementService = utility.getUserManagementService();
-
     var publicMethods = {};
     var privateMethods = {};
 
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/modules/user.js b/modules/distribution/src/repository/jaggeryapps/iotserver/modules/user.js
index b8882e8f..e294a1e1 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/modules/user.js
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/modules/user.js
@@ -250,16 +250,25 @@ userModule = function () {
             log.error("User object was not found in the session");
             throw constants.ERRORS.USER_NOT_FOUND;
         }
+        var carbon = require('carbon');
+        var tenantId = carbon.server.tenantId();
+        var url = carbon.server.address('https') + "/admin/services";
+        var server = new carbon.server.Server(url);
         var userManager = new carbon.user.UserManager(server, tenantId);
         var userList = userManager.listUsers();
-
-        var i, userObject;
-        for (i = 0; i < userList.size(); i++) {
-            userObject = userList.get(i);
-            var userObj = {
-                "username" : userObject.getUserName(),
-                "email" : userObject.getEmail(),
-                "name" : userObject.getFirstName() + " " + userObject.getLastName()
+        var i, userObject, email, firstname, lastname;
+        for (i = 0; i < userList.length; i++) {
+            userObject = userManager.getUser(userList[i]);
+            email = userManager.getClaim(userList[i],"http://wso2.org/claims/emailaddress", null);
+            firstname = userManager.getClaim(userList[i],"http://wso2.org/claims/givenname", null);
+            lastname = userManager.getClaim(userList[i],"http://wso2.org/claims/lastname", null);
+            //log.info(userManager.getClaimsForSet(userList[i], new Array("http://wso2.org/claims/emailaddress",
+            //    "http://wso2.org/claims/givenname",
+            //    "http://wso2.org/claims/lastname"), null));
+            userObj = {
+                "username" : userObject.username,
+                "email" : email,
+                "name" : firstname + " " + lastname
             };
             if(userObj.username == "admin"){
                 userObj.name = "admin";