diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error400.html b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error400.html
index 9213fa2e2f..3b0349ef37 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error400.html
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error400.html
@@ -27,7 +27,7 @@
 <i class="icon-unlink error-icon"></i>
 <h1>Error 400</h1>
 <h3>We are unable to understand the request and process it. Please re-check your request.</h3>
-<h4 id="link"><a href="/emm">Go to EMM</a></h4>
+<h4 id="link"><a href="/devicemgt">Go to IoT Home</a></h4>
 </body>
 </html>
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error401.html b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error401.html
index e803601a08..0502d8fda6 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error401.html
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error401.html
@@ -27,7 +27,7 @@
 <i class="icon-unlink error-icon"></i>
 <h1>Error 401</h1>
 <h3>You do not have permission to access this page.Please contact your administrator and request permission.</h3>
-<h4 id="link"><a href="/emm">Go to EMM</a></h4>
+<h4 id="link"><a href="/devicemgt">Go to IoT Home</a></h4>
 </body>
 </html>
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error403.html b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error403.html
index e7615ea7de..b4fbfdaceb 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error403.html
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error403.html
@@ -28,7 +28,7 @@
 <i class="icon-unlink error-icon"></i>
 <h1>Error 403</h1>
 <h3>We cannot process this request.</h3>
-<h4 id="link"><a href="/emm">Go to EMM</a></h4>
+<h4 id="link"><a href="/devicemgt">Go to IoT Home</a></h4>
 </body>
 </html>
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error404.html b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error404.html
index 49c9ab87e4..d2a9cd0365 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error404.html
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error404.html
@@ -27,7 +27,7 @@
 <i class="icon-unlink error-icon"></i>
 <h1>Error 404</h1>
 <h3>We can't find what you are looking for.</h3>
-<h4 id="link"><a href="/emm">Go to EMM</a></h4>
+<h4 id="link"><a href="/devicemgt">Go to IoT Home</a></h4>
 </body>
 </html>
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error405.html b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error405.html
index d42ff5fe20..dd1b781246 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error405.html
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error405.html
@@ -27,7 +27,7 @@
 <i class="icon-unlink error-icon"></i>
 <h1>Error 405</h1>
 <h3>Method not allowed.</h3>
-<h4 id="link"><a href="/emm">Go to EMM</a></h4>
+<h4 id="link"><a href="/devicemgt">Go to IoT Home</a></h4>
 </body>
 </html>
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error500.html b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error500.html
index 48cfdc4c97..4ec7b17228 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error500.html
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error500.html
@@ -26,7 +26,7 @@
 <i class="icon-ambulance error-icon"></i>
 <h1>Error 500</h1>
 <h3>Something went wrong and we're trying to fix it.</h3>
-<h4 id="link"><a href="/emm">Go to EMM</a></h4>
+<h4 id="link"><a href="/devicemgt">Go to IoT Home</a></h4>
 </body>
 </html>
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/jaggery.conf b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/jaggery.conf
index 832c1ab252..fb71f60e96 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/jaggery.conf
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/jaggery.conf
@@ -108,7 +108,7 @@
     "contextParams" : [
       {
         "name" : "Owasp.CsrfGuard.Config",
-        "value" : "/repository/conf/security/Owasp.CsrfGuard.dashboard.properties"
+        "value" : "/repository/conf/security/Owasp.CsrfGuard.Carbon.properties"
       }
     ]
 }
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/jaggery.conf b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/jaggery.conf
index f97bae72cf..7c5a2d41c9 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/jaggery.conf
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/jaggery.conf
@@ -71,7 +71,7 @@
      "contextParams" : [
        {
          "name" : "Owasp.CsrfGuard.Config",
-         "value" : "/repository/conf/security/Owasp.CsrfGuard.dashboard.properties"
+         "value" : "/repository/conf/security/Owasp.CsrfGuard.Carbon.properties"
        }
      ]
 }
\ No newline at end of file