diff --git a/src/OpenIddict.Mvc/Views/Shared/Authorize.cshtml b/src/OpenIddict.Mvc/Views/Shared/Authorize.cshtml
index 33a1919d..9f7935c9 100644
--- a/src/OpenIddict.Mvc/Views/Shared/Authorize.cshtml
+++ b/src/OpenIddict.Mvc/Views/Shared/Authorize.cshtml
@@ -6,8 +6,11 @@
 <div class="jumbotron">
     <h1>Authorization</h1>
 
-    <p class="lead text-left">Do you wanna grant <strong>@Model.Item2</strong> access to your resources? (scopes requested: @Model.Item1.Scope)</p>
-    <p class="lead text-left"><strong>@Model.Item2</strong> will be able to access the following endpoints: @string.Join(" ; ", Model.Item1.GetResources())</p>
+    <p class="lead text-left">Do you want to grant <strong>@Model.Item2</strong> access to your data? (scopes requested: @Model.Item1.Scope)</p>
+
+    @if (!string.IsNullOrEmpty(Model.Item1.Resource)) {
+        <p class="lead text-left"><strong>@Model.Item2</strong> will be able to access the following endpoints: @string.Join(" ; ", Model.Item1.GetResources())</p>
+    }
 
     <form enctype="application/x-www-form-urlencoded" method="post">
         @Html.AntiForgeryToken()
@@ -16,7 +19,7 @@
             <input type="hidden" name="@parameter.Key" value="@parameter.Value" />
         }
 
-        <input formaction="@Url.Action("Accept")" class="btn btn-lg btn-success" name="Authorize" type="submit" value="Yeah, sure" />
-        <input formaction="@Url.Action("Deny")" class="btn btn-lg btn-danger" name="Deny" type="submit" value="Hell, no" />
+        <input formaction="@Url.Action("Accept")" class="btn btn-lg btn-success" name="Authorize" type="submit" value="Yes" />
+        <input formaction="@Url.Action("Deny")" class="btn btn-lg btn-danger" name="Deny" type="submit" value="No" />
     </form>
 </div>
diff --git a/src/OpenIddict.Mvc/Views/Shared/Logout.cshtml b/src/OpenIddict.Mvc/Views/Shared/Logout.cshtml
index e8a727c1..343082bb 100644
--- a/src/OpenIddict.Mvc/Views/Shared/Logout.cshtml
+++ b/src/OpenIddict.Mvc/Views/Shared/Logout.cshtml
@@ -13,6 +13,6 @@
             <input type="hidden" name="@parameter.Key" value="@parameter.Value" />
         }
 
-        <input class="btn btn-lg btn-success" name="Authorize" type="submit" value="Yeah, sure" />
+        <input class="btn btn-lg btn-success" name="Confirm" type="submit" value="Yes" />
     </form>
 </div>
\ No newline at end of file