diff --git a/oauth2/playground2/src/main/org/wso2/sample/identity/oauth2/ApplicationConfig.java b/oauth2/playground2/src/main/org/wso2/sample/identity/oauth2/ApplicationConfig.java
index 8c3c09e19..59ef148e7 100644
--- a/oauth2/playground2/src/main/org/wso2/sample/identity/oauth2/ApplicationConfig.java
+++ b/oauth2/playground2/src/main/org/wso2/sample/identity/oauth2/ApplicationConfig.java
@@ -41,6 +41,7 @@ public class ApplicationConfig {
     public static final String LOGOUT_ENDPOINT_CONTEXT = "LogoutEndpointContext";
     public static final String USER_INFO_ENDPOINT_CONTEXT = "UserInfoEndpointContext";
     public static final String SESSION_IFRAME_ENDPOINT_CONTEXT = "SessionIFrameEndpointContext";
+    public static final String POST_LOGOUT_REDIRECT_URI = "PostLogoutRedirectUri";
 
     private static Properties properties = new Properties();
 
@@ -138,6 +139,15 @@ public static int getISPort() {
         return value;
     }
 
+    public static String getPostLogoutRedirectUri() {
+
+        String postLogoutRedirectUri = getProperties().getProperty(POST_LOGOUT_REDIRECT_URI);
+        if (StringUtils.isBlank(postLogoutRedirectUri)) {
+            postLogoutRedirectUri = StringUtils.EMPTY;
+        }
+        return postLogoutRedirectUri;
+    }
+
     private static String buildURL(String context) {
         String buildURL = "";
         if (StringUtils.isNotEmpty(context)) {
diff --git a/oauth2/playground2/src/main/resources/playground2.properties b/oauth2/playground2/src/main/resources/playground2.properties
index 31bb4cd01..b279a8e90 100644
--- a/oauth2/playground2/src/main/resources/playground2.properties
+++ b/oauth2/playground2/src/main/resources/playground2.properties
@@ -5,7 +5,7 @@ ConsumerSecret=
 Scope=openid
 #Callback URL endpoint that is configured in Identity Server for this OAuth2 application.
 CallbackURL=http://localhost:8080/playground2/oauth2client
-
+PostLogoutRedirectUri=http://localhost:8080/playground2/oauth2client
 #Identity Server endpoint details.
 IdentityServerHostName=localhost
 IdentityServerPort=9443
diff --git a/oauth2/playground2/src/main/webapp/oauth2.jsp b/oauth2/playground2/src/main/webapp/oauth2.jsp
index c568cf48c..cf9639b96 100644
--- a/oauth2/playground2/src/main/webapp/oauth2.jsp
+++ b/oauth2/playground2/src/main/webapp/oauth2.jsp
@@ -687,10 +687,21 @@
                             <td><input type="submit" name="authorize" value="Get Access Token"></td>
                             <%
                                 if (isOIDCLogoutEnabled) {
+                                    String logout_url = (String)session.getAttribute(OAuth2Constants.OIDC_LOGOUT_ENDPOINT);
+                                    if (StringUtils.isNotBlank(ApplicationConfig.getPostLogoutRedirectUri())) {
+                                        logout_url+= "?post_logout_redirect_uri=" + ApplicationConfig.getPostLogoutRedirectUri() + "&";
+                                    } else {
+                                        logout_url+= "?";
+                                    }
+                                    if (StringUtils.isNotBlank(idToken)) {
+                                        logout_url+= "id_token_hint=" + idToken;
+                                    } else {
+                                        logout_url+= "client_id=" + (String)session.getAttribute(OAuth2Constants.CONSUMER_KEY);
+                                    }
                             %>
                             <td>
                                 <button type="button" class="button"
-                                        onclick="document.location.href='<%=(String)session.getAttribute(OAuth2Constants.OIDC_LOGOUT_ENDPOINT)%>';">
+                                        onclick="document.location.href='<%=logout_url%>';">
                                     Logout
                                 </button>
                             </td>
@@ -756,10 +767,21 @@
                             </td>
                             <%
                                 if (isOIDCLogoutEnabled) {
+                                    String logout_url = (String)session.getAttribute(OAuth2Constants.OIDC_LOGOUT_ENDPOINT);
+                                    if (StringUtils.isNotBlank(ApplicationConfig.getPostLogoutRedirectUri())) {
+                                        logout_url+= "?post_logout_redirect_uri=" + ApplicationConfig.getPostLogoutRedirectUri() + "&";
+                                    } else {
+                                        logout_url+= "?";
+                                    }
+                                    if (StringUtils.isNotBlank(idToken)) {
+                                        logout_url+= "id_token_hint=" + idToken;
+                                    } else {
+                                        logout_url+= "client_id=" + (String)session.getAttribute(OAuth2Constants.CONSUMER_KEY);
+                                    }
                             %>
                             <td>
                                 <button type="button" class="button"
-                                        onclick="document.location.href='<%=(String)session.getAttribute(OAuth2Constants.OIDC_LOGOUT_ENDPOINT)%>';">
+                                        onclick="document.location.href='<%=logout_url%>';">
                                     Logout
                                 </button>
                             </td>
@@ -817,10 +839,21 @@
                             </td>
                             <%
                                 if (isOIDCLogoutEnabled) {
+                                    String logout_url = (String)session.getAttribute(OAuth2Constants.OIDC_LOGOUT_ENDPOINT);
+                                    if (StringUtils.isNotBlank(ApplicationConfig.getPostLogoutRedirectUri())) {
+                                        logout_url+= "?post_logout_redirect_uri=" + ApplicationConfig.getPostLogoutRedirectUri() + "&";
+                                    } else {
+                                        logout_url+= "?";
+                                    }
+                                    if (StringUtils.isNotBlank(idToken)) {
+                                        logout_url+= "id_token_hint=" + idToken;
+                                    } else {
+                                        logout_url+= "client_id=" + (String)session.getAttribute(OAuth2Constants.CONSUMER_KEY);
+                                    }
                             %>
                             <td>
                                 <button type="button" class="button"
-                                        onclick="document.location.href='<%=(String)session.getAttribute(OAuth2Constants.OIDC_LOGOUT_ENDPOINT)%>';">
+                                        onclick="document.location.href='<%=logout_url%>';">
                                     Logout
                                 </button>
                             </td>
@@ -882,6 +915,18 @@
                     <tr>
                         <script type="text/javascript">
                             var idtoken = getIDtoken();
+                            var logout_url = "<%=(String)session.getAttribute(OAuth2Constants.OIDC_LOGOUT_ENDPOINT)%>";
+                            var post_logout_redirect_uri = '<%=ApplicationConfig.getPostLogoutRedirectUri()%>';
+                            if (post_logout_redirect_uri != 'null' && post_logout_redirect_uri != '') {
+                                logout_url = logout_url + '?post_logout_redirect_uri=' + post_logout_redirect_uri + "&";
+                            } else {
+                                logout_url = logout_url + "?";
+                            }
+                            if (idtoken != 'null' && idtoken != '') {
+                                logout_url = logout_url + 'id_token_hint=' + idtoken;
+                            } else {
+                                logout_url = logout_url + 'client_id=<%=(String)session.getAttribute(OAuth2Constants.CONSUMER_KEY)%>';
+                            }
                             renderImplicitFlowIdTokenHTML(idtoken);
                             var decodedIdToken = JSON.parse(getDecodedIDToken(idtoken));
                             makeList(decodedIdToken);
@@ -890,7 +935,7 @@
                     <tr>
                         <td>
                             <button type="button" class="button"
-                                    onclick="document.location.href='<%=(String)session.getAttribute(OAuth2Constants.OIDC_LOGOUT_ENDPOINT)%>';">
+                                    onclick="document.location.href=logout_url;">
                                 Logout
                             </button>
                         </td>
@@ -911,6 +956,18 @@
                     <tr>
                         <script type="text/javascript">
                             var idtoken = getIDtoken();
+                            var logout_url = "<%=(String)session.getAttribute(OAuth2Constants.OIDC_LOGOUT_ENDPOINT)%>";
+                            var post_logout_redirect_uri = '<%=ApplicationConfig.getPostLogoutRedirectUri()%>';
+                            if (post_logout_redirect_uri != 'null' && post_logout_redirect_uri != '') {
+                                logout_url = logout_url + '?post_logout_redirect_uri=' + post_logout_redirect_uri + "&";
+                            } else {
+                                logout_url = logout_url + "?";
+                            }
+                            if (idtoken != 'null' && idtoken != '') {
+                                logout_url = logout_url + 'id_token_hint=' + idtoken;
+                            } else {
+                                logout_url = logout_url + 'client_id=<%=(String)session.getAttribute(OAuth2Constants.CONSUMER_KEY)%>';
+                            }
                             renderImplicitFlowIdTokenTokenHTML(idtoken);
                             var decodedIdToken = JSON.parse(getDecodedIDToken(idtoken));
                             makeList(decodedIdToken);
@@ -920,7 +977,7 @@
                     <tr>
                         <td>
                             <button type="button" class="button"
-                                    onclick="document.location.href='<%=(String)session.getAttribute(OAuth2Constants.OIDC_LOGOUT_ENDPOINT)%>';">
+                                    onclick="document.location.href=logout_url;">
                                 Logout
                             </button>
                         </td>
diff --git a/oauth2/playground2/src/main/webapp/user-info.jsp b/oauth2/playground2/src/main/webapp/user-info.jsp
index 5e1f08ba1..6169b19ee 100755
--- a/oauth2/playground2/src/main/webapp/user-info.jsp
+++ b/oauth2/playground2/src/main/webapp/user-info.jsp
@@ -1,6 +1,7 @@
 <%@page import="org.apache.commons.lang.StringUtils" %>
 <%@page import="org.json.simple.JSONObject" %>
 <%@page import="org.json.simple.parser.JSONParser" %>
+<%@page import="org.wso2.sample.identity.oauth2.ApplicationConfig" %>
 <%@page import="org.wso2.sample.identity.oauth2.OAuth2Constants" %>
 <%@page import="java.util.Iterator" %>
 <%@page import="java.util.Map" %>
@@ -92,10 +93,22 @@
         <tr>
             <%
                 if (isOIDCLogoutEnabled) {
+                    String idTokenHint = (String)session.getAttribute(OAuth2Constants.ID_TOKEN);
+                    String logout_url = (String)session.getAttribute(OAuth2Constants.OIDC_LOGOUT_ENDPOINT);
+                    if (StringUtils.isNotBlank(ApplicationConfig.getPostLogoutRedirectUri())) {
+                        logout_url+= "?post_logout_redirect_uri=" + ApplicationConfig.getPostLogoutRedirectUri() + "&";
+                    } else {
+                        logout_url+= "?";
+                    }
+                    if (StringUtils.isNotBlank(idTokenHint)) {
+                        logout_url+= "id_token_hint=" + idTokenHint;
+                    } else {
+                        logout_url+= "client_id=" + (String)session.getAttribute(OAuth2Constants.CONSUMER_KEY);
+                    }
             %>
             <td colspan="2">
                 <button type="button" class="button"
-                        onclick="document.location.href='<%=(String)session.getAttribute(OAuth2Constants.OIDC_LOGOUT_ENDPOINT)%>';">
+                        onclick="document.location.href='<%=logout_url%>';">
                     Logout
                 </button>
             </td>