diff --git a/components/registry/org.wso2.carbon.registry.extensions.ui/src/main/java/org/wso2/carbon/registry/extensions/ui/AddExtensionProcessor.java b/components/registry/org.wso2.carbon.registry.extensions.ui/src/main/java/org/wso2/carbon/registry/extensions/ui/AddExtensionProcessor.java
index 682dd7845c..392f552d6a 100644
--- a/components/registry/org.wso2.carbon.registry.extensions.ui/src/main/java/org/wso2/carbon/registry/extensions/ui/AddExtensionProcessor.java
+++ b/components/registry/org.wso2.carbon.registry.extensions.ui/src/main/java/org/wso2/carbon/registry/extensions/ui/AddExtensionProcessor.java
@@ -24,6 +24,7 @@
 import org.wso2.carbon.CarbonException;
 import org.wso2.carbon.registry.extensions.ui.clients.ResourceServiceClient;
 import org.wso2.carbon.ui.CarbonUIMessage;
+import org.wso2.carbon.ui.CarbonUIUtil;
 import org.wso2.carbon.ui.transports.fileupload.AbstractFileUploadExecutor;
 import org.wso2.carbon.utils.FileItemData;
 import org.wso2.carbon.utils.ServerConstants;
@@ -53,8 +54,8 @@ public boolean execute(HttpServletRequest request, HttpServletResponse response)
             log.error(msg);
 
             CarbonUIMessage.sendCarbonUIMessage(msg, CarbonUIMessage.ERROR, request);
-            response.sendRedirect(
-                    getContextRoot(request) + "/" + webContext + "/admin/error.jsp");
+            response.sendRedirect(CarbonUIUtil.resolveAdminConsoleBaseURL(getContextRoot(request), "/" +
+                    webContext + "/admin/error.jsp", request));
 
             return false;
         }
@@ -89,9 +90,11 @@ public boolean execute(HttpServletRequest request, HttpServletResponse response)
             String msg = "Successfully uploaded extension.";
             if (redirect == null) {
                 CarbonUIMessage.sendCarbonUIMessage(msg, CarbonUIMessage.INFO, request);
-                response.sendRedirect(getContextRoot(request) + "/" + webContext + "/admin/index.jsp");
+                response.sendRedirect(CarbonUIUtil.resolveAdminConsoleBaseURL(getContextRoot(request), "/" +
+                        webContext + "/admin/index.jsp", request));
             } else {
-                response.sendRedirect(getContextRoot(request) + "/" + webContext + "/" + redirect);
+                response.sendRedirect(CarbonUIUtil.resolveAdminConsoleBaseURL(getContextRoot(request), "/" +
+                        webContext + "/" + redirect, request));
             }
             return true;
 
@@ -102,12 +105,12 @@ public boolean execute(HttpServletRequest request, HttpServletResponse response)
 
             if (errorRedirect == null) {
                 CarbonUIMessage.sendCarbonUIMessage(msg, CarbonUIMessage.ERROR, request);
-                response.sendRedirect(
-                        getContextRoot(request) + "/" + webContext + "/admin/error.jsp");
+                response.sendRedirect(CarbonUIUtil.resolveAdminConsoleBaseURL(getContextRoot(request), "/" +
+                        webContext + "/admin/error.jsp", request));
             } else {
-                response.sendRedirect(
-                        getContextRoot(request) + "/" + webContext + "/" + errorRedirect + (errorRedirect.indexOf("?")
-                                == -1 ? "?" : "&")  + "msg=" + URLEncoder.encode(msg, "UTF-8"));
+                response.sendRedirect(CarbonUIUtil.resolveAdminConsoleBaseURL(getContextRoot(request), "/" +
+                        webContext + "/" + errorRedirect + (errorRedirect.indexOf("?")
+                                == -1 ? "?" : "&")  + "msg=" + URLEncoder.encode(msg, "UTF-8"), request));
             }
             return false;
         } catch (RuntimeException e) {
@@ -132,12 +135,12 @@ private void buildUIError(HttpServletRequest request, HttpServletResponse respon
             throws IOException {
         CarbonUIMessage.sendCarbonUIMessage(msg, CarbonUIMessage.ERROR, request);
         if (errorRedirect == null) {
-            response.sendRedirect(
-                    getContextRoot(request) + "/" + webContext + "/admin/error.jsp");
+            response.sendRedirect(CarbonUIUtil.resolveAdminConsoleBaseURL(getContextRoot(request), "/" +
+                    webContext + "/admin/error.jsp", request));
         } else {
-            response.sendRedirect(
-                    getContextRoot(request) + "/" + webContext + "/" + errorRedirect + (errorRedirect.indexOf("?")
-                            == -1 ? "?" : "&")  + "msg=" + URLEncoder.encode(msg, "UTF-8"));
+            response.sendRedirect(CarbonUIUtil.resolveAdminConsoleBaseURL(getContextRoot(request), "/" +
+                    webContext + "/" + errorRedirect + (errorRedirect.indexOf("?")
+                            == -1 ? "?" : "&")  + "msg=" + URLEncoder.encode(msg, "UTF-8"), request));
         }
     }
 }
diff --git a/components/registry/org.wso2.carbon.registry.profiles.ui/src/main/resources/web/userprofiles/profiles_handler_ajaxprocessor.jsp b/components/registry/org.wso2.carbon.registry.profiles.ui/src/main/resources/web/userprofiles/profiles_handler_ajaxprocessor.jsp
index e6a66e7c91..54c55a4f00 100644
--- a/components/registry/org.wso2.carbon.registry.profiles.ui/src/main/resources/web/userprofiles/profiles_handler_ajaxprocessor.jsp
+++ b/components/registry/org.wso2.carbon.registry.profiles.ui/src/main/resources/web/userprofiles/profiles_handler_ajaxprocessor.jsp
@@ -34,7 +34,7 @@
     ProfilesAdminServiceClient client = new ProfilesAdminServiceClient(config,session);
     if(username != null && client.putUserProfile(username)){
         String resourcePagePath = "../resources/resource.jsp?region=region3&item=resource_browser_menu&viewType=std&path=/_system/config/users";
-        response.sendRedirect(resourcePagePath);
+        response.sendRedirect(CarbonUIUtil.resolveAdminConsoleBaseURL("", resourcePagePath, request));
         return;
     }
     else{
diff --git a/components/registry/org.wso2.carbon.registry.resource.ui/src/main/java/org/wso2/carbon/registry/resource/ui/processors/AddResourceProcessor.java b/components/registry/org.wso2.carbon.registry.resource.ui/src/main/java/org/wso2/carbon/registry/resource/ui/processors/AddResourceProcessor.java
index 91e4eaa12d..b5d93bfd9b 100644
--- a/components/registry/org.wso2.carbon.registry.resource.ui/src/main/java/org/wso2/carbon/registry/resource/ui/processors/AddResourceProcessor.java
+++ b/components/registry/org.wso2.carbon.registry.resource.ui/src/main/java/org/wso2/carbon/registry/resource/ui/processors/AddResourceProcessor.java
@@ -27,6 +27,7 @@
 import org.wso2.carbon.server.admin.ui.ServerAdminClient;
 import org.wso2.carbon.registry.core.RegistryConstants;
 import org.wso2.carbon.registry.resource.ui.clients.ResourceServiceClient;
+import org.wso2.carbon.ui.CarbonUIUtil;
 import org.wso2.carbon.ui.transports.fileupload.AbstractFileUploadExecutor;
 import org.wso2.carbon.ui.CarbonUIMessage;
 import org.wso2.carbon.ui.transports.fileupload.FileSizeLimitExceededException;
@@ -62,8 +63,9 @@ public boolean execute(HttpServletRequest request, HttpServletResponse response)
             log.error(msg);
 
             CarbonUIMessage.sendCarbonUIMessage(msg, CarbonUIMessage.ERROR, request);
-            response.sendRedirect(
-                    getContextRoot(request) + "/" + webContext + "/resources/resource.jsp?region=region3&item=resource_browser_menu&errorMsg=" + msg);
+            response.sendRedirect(CarbonUIUtil.resolveAdminConsoleBaseURL(getContextRoot(request), "/" +
+                    webContext + "/resources/resource.jsp?region=region3&item=resource_browser" +
+                    "_menu&errorMsg=" + msg, request));
 
             return false;
         }
@@ -80,14 +82,15 @@ public boolean execute(HttpServletRequest request, HttpServletResponse response)
                     String msg = "File upload failed. " + errorAttribute;
                     if (errorRedirect == null) {
                         CarbonUIMessage.sendCarbonUIMessage(msg, CarbonUIMessage.ERROR, request);
-                        response.sendRedirect(
-                                getContextRoot(request) + "/" + webContext + "/resources/resource.jsp?region=region3&item=resource_browser_menu&errorMsg=" + msg);
+                        response.sendRedirect(CarbonUIUtil.resolveAdminConsoleBaseURL(getContextRoot(request),
+                                "/" + webContext + "/resources/resource.jsp?region=region3&item" +
+                                "=resource_browser_menu&errorMsg=" + msg, request));
                     } else {
-                        response.sendRedirect(
-                                getContextRoot(request) + "/" + webContext + "/" + errorRedirect +
+                        response.sendRedirect(CarbonUIUtil.resolveAdminConsoleBaseURL(getContextRoot(request),
+                                "/" + webContext + "/" + errorRedirect +
                                         (errorRedirect.indexOf("?")
                                                 == -1 ? "?" : "&") + "msg=" +
-                                        URLEncoder.encode(msg, "UTF-8"));
+                                        URLEncoder.encode(msg, "UTF-8"), request));
                     }
                     return false;
                 }
@@ -185,10 +188,12 @@ public boolean execute(HttpServletRequest request, HttpServletResponse response)
                 } else {
                     parentPath = URLEncoder.encode(parentPath, "UTF-8");
                 }
-                response.sendRedirect(getContextRoot(request) + "/" + webContext + "/resources/resource.jsp?region=region3&item=resource_browser_menu&path=" +
-                        parentPath);
+                response.sendRedirect(CarbonUIUtil.resolveAdminConsoleBaseURL(getContextRoot(request), "/" +
+                        webContext + "/resources/resource.jsp?region=region3&item=resource_browser_menu&path=" +
+                        parentPath, request));
             } else {
-                response.sendRedirect(getContextRoot(request) + "/" + webContext + "/" + redirect);
+                response.sendRedirect(CarbonUIUtil.resolveAdminConsoleBaseURL(getContextRoot(request), "/" +
+                        webContext + "/" + redirect, request));
             }
             return true;
 
@@ -198,12 +203,13 @@ public boolean execute(HttpServletRequest request, HttpServletResponse response)
             log.error("File upload failed. ", e);
             if (errorRedirect == null) {
                 CarbonUIMessage.sendCarbonUIMessage(msg, CarbonUIMessage.ERROR, request);
-                response.sendRedirect(
-                        getContextRoot(request) + "/" + webContext + "/resources/resource.jsp?region=region3&item=resource_browser_menu&errorMsg=" + msg);
+                response.sendRedirect(CarbonUIUtil.resolveAdminConsoleBaseURL(getContextRoot(request), "/" +
+                        webContext + "/resources/resource.jsp?region=region3&item=resource_browser_" +
+                        "menu&errorMsg=" + msg, request));
             } else {
-                response.sendRedirect(
-                        getContextRoot(request) + "/" + webContext + "/" + errorRedirect + (errorRedirect.indexOf("?")
-                                == -1 ? "?" : "&")  + "msg=" + URLEncoder.encode(msg, "UTF-8"));
+                response.sendRedirect(CarbonUIUtil.resolveAdminConsoleBaseURL(getContextRoot(request), "/" +
+                        webContext + "/" + errorRedirect + (errorRedirect.indexOf("?")
+                        == -1 ? "?" : "&")  + "msg=" + URLEncoder.encode(msg, "UTF-8"), request));
             }
             return false;
         } catch (RuntimeException e) {
@@ -238,12 +244,13 @@ private void buildUIError(HttpServletRequest request, HttpServletResponse respon
             throws IOException {
         CarbonUIMessage.sendCarbonUIMessage(msg, CarbonUIMessage.ERROR, request);
         if (errorRedirect == null) {
-            response.sendRedirect(
-                    getContextRoot(request) + "/" + webContext + "/resources/resource.jsp?region=region3&item=resource_browser_menu&errorMsg=" + msg);
+            response.sendRedirect(CarbonUIUtil.resolveAdminConsoleBaseURL(getContextRoot(request), "/" +
+                    webContext + "/resources/resource.jsp?region=region3&item=resource_browser" +
+                    "_menu&errorMsg=" + msg, request));
         } else {
-            response.sendRedirect(
-                    getContextRoot(request) + "/" + webContext + "/" + errorRedirect + (errorRedirect.indexOf("?")
-                            == -1 ? "?" : "&")  + "msg=" + URLEncoder.encode(msg, "UTF-8"));
+            response.sendRedirect(CarbonUIUtil.resolveAdminConsoleBaseURL(getContextRoot(request), "/" +
+                    webContext + "/" + errorRedirect + (errorRedirect.indexOf("?")
+                            == -1 ? "?" : "&")  + "msg=" + URLEncoder.encode(msg, "UTF-8"), request));
         }
     }
 }
diff --git a/components/registry/org.wso2.carbon.registry.social.impl/src/test/java/org/wso2/carbon/registry/social/impl/test/people/userprofile/ClaimTestUtil.java b/components/registry/org.wso2.carbon.registry.social.impl/src/test/java/org/wso2/carbon/registry/social/impl/test/people/userprofile/ClaimTestUtil.java
index 3fd667a3fd..e460429615 100644
--- a/components/registry/org.wso2.carbon.registry.social.impl/src/test/java/org/wso2/carbon/registry/social/impl/test/people/userprofile/ClaimTestUtil.java
+++ b/components/registry/org.wso2.carbon.registry.social.impl/src/test/java/org/wso2/carbon/registry/social/impl/test/people/userprofile/ClaimTestUtil.java
@@ -34,6 +34,8 @@ public class ClaimTestUtil {
     public static final String CLAIM_URI6 = "http://wso2.org/claims/lastname";
     public static final String CLAIM_URI7 = "http://wso2.org/claims/nickname";
     public static final String CLAIM_URI8 = "http://wso2.org/claims/displayname";
+    public static final String CLAIM_URI9 = "http://wso2.org/claims/userid";
+    public static final String CLAIM_URI10 = "http://wso2.org/claims/username";
     public static final String HOME_PROFILE_NAME = "HomeProfile";
 
     public static Map<String, ClaimMapping> getClaimTestData() {
@@ -142,6 +144,30 @@ public static Map<String, ClaimMapping> getClaimTestData() {
         cm8.setMappedAttribute("attr8");
         claims.put(CLAIM_URI8, cm8);
 
+        Claim claim9 = new Claim();
+        claim9.setClaimUri(CLAIM_URI9);
+        claim9.setDescription("Unique ID of the user");
+        claim9.setDialectURI("http://wso2.org/");
+        claim9.setDisplayTag("User ID");
+        claim9.setRequired(true);
+        claim9.setSupportedByDefault(true);
+        ClaimMapping cm9 = new ClaimMapping();
+        cm9.setClaim(claim9);
+        cm9.setMappedAttribute("scimId");
+        claims.put(CLAIM_URI9, cm9);
+
+        Claim claim10 = new Claim();
+        claim10.setClaimUri(CLAIM_URI10);
+        claim10.setDescription("Unique ID of the user");
+        claim10.setDialectURI("http://wso2.org/");
+        claim10.setDisplayTag("User ID");
+        claim10.setRequired(true);
+        claim10.setSupportedByDefault(true);
+        ClaimMapping cm10 = new ClaimMapping();
+        cm10.setClaim(claim10);
+        cm10.setMappedAttribute("scimId");
+        claims.put(CLAIM_URI10, cm10);
+
         return claims;
 
     }
@@ -157,4 +183,4 @@ public static Map<String, ProfileConfiguration> getProfileTestData() {
         return map;
     }
 
-}
\ No newline at end of file
+}
diff --git a/pom.xml b/pom.xml
index ade92302a3..313186ee8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1602,7 +1602,7 @@
     <properties>
         <!-- Carbon platform version comes here-->
 
-        <carbon.kernel.version>4.5.3</carbon.kernel.version>
+        <carbon.kernel.version>4.10.17</carbon.kernel.version>
         <carbon.kernel.feature.version>${carbon.kernel.version}</carbon.kernel.feature.version>
         <carbon.kernel.package.import.version.range>[4.5.0, 5.0.0)</carbon.kernel.package.import.version.range>