diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/HttpRequest/HttpRequest.dialog b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/HttpRequest/HttpRequest.dialog
index 1870dd309b..cce25d6cc9 100644
--- a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/HttpRequest/HttpRequest.dialog
+++ b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/HttpRequest/HttpRequest.dialog
@@ -49,12 +49,12 @@
           "method": "POST",
           "url": "http://petstore.swagger.io/v2/pet",
           "body": {
-            "id": "{user.petid}",
+            "id": "${user.petid}",
             "category": {
               "id": 0,
               "name": "string"
             },
-            "name": "{user.petname}",
+            "name": "${user.petname}",
             "photoUrls": [
               "string"
             ],
@@ -96,7 +96,7 @@
             "id": "705959"
           },
           "method": "GET",
-          "url": "http://petstore.swagger.io/v2/pet/{user.id}",
+          "url": "http://petstore.swagger.io/v2/pet/${user.id}",
           "resultProperty": "user.getResponse"
         },
         {
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/OAuthInput/OAuthInput.dialog b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/OAuthInput/OAuthInput.dialog
index fd8d7f04c0..bbcf0003e0 100644
--- a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/OAuthInput/OAuthInput.dialog
+++ b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/OAuthInput/OAuthInput.dialog
@@ -39,7 +39,7 @@
           "method": "GET",
           "url": "https://graph.microsoft.com/beta/me/mailFolders/inbox/messages",
           "headers": {
-            "Authorization": "Bearer {user.token.token}"
+            "Authorization": "Bearer ${user.token.token}"
           },
           "resultProperty": "user.getGraphEmails"
         },
diff --git a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/OAuthInput/OAuthInput.lg b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/OAuthInput/OAuthInput.lg
index 550972f230..3b34c92815 100644
--- a/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/OAuthInput/OAuthInput.lg
+++ b/Composer/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/OAuthInput/OAuthInput.lg
@@ -1,4 +1,17 @@
 [import](common.lg)
 
 # bfdactivity-991558
--${ShowEmailSummary(user)}
\ No newline at end of file
+-${ShowEmailSummary(user)}
+
+# ShowEmailSummary(user)
+- IF: ${count(user.getGraphEmails.value) == 1}
+  - You have ${count(user.getGraphEmails.value)} email. This email is ${ShowEmail(user.getGraphEmails.value[0])}.
+- ELSEIF: ${count(user.getGraphEmails.value) >= 2}
+  - You have ${count(user.getGraphEmails.value)} emails, the first email is ${ShowEmail(user.getGraphEmails.value[0])}.
+- ELSEIF: ${count(user.getGraphEmails.value) == 0}
+  - You don't have any email.
+- ELSE:
+  - You should not be here.
+
+# ShowEmail(email)
+- ${email.subject}
\ No newline at end of file