diff --git a/ghost/admin/app/components/gh-post-settings-menu.hbs b/ghost/admin/app/components/gh-post-settings-menu.hbs
index 6d1c1119b7..9c06ec85c5 100644
--- a/ghost/admin/app/components/gh-post-settings-menu.hbs
+++ b/ghost/admin/app/components/gh-post-settings-menu.hbs
@@ -129,7 +129,7 @@
                         </button>
                         {{svg-jar "arrow-right"}}
                     </li>
-                    {{#if (and this.feature.members (eq this.post.displayName "post") showEmailNewsletter)}}
+                    {{#if (and this.feature.members this.post.isPost) showEmailNewsletter)}}
                         <li class="nav-list-item" {{action "showSubview" "email-settings"}} data-test-button="email-settings">
                             <button type="button">
                                 <b>Email newsletter</b>
diff --git a/ghost/admin/app/components/gh-publishmenu-draft.js b/ghost/admin/app/components/gh-publishmenu-draft.js
index 4b07a6dc9b..6ebb52ab52 100644
--- a/ghost/admin/app/components/gh-publishmenu-draft.js
+++ b/ghost/admin/app/components/gh-publishmenu-draft.js
@@ -47,10 +47,10 @@ export default Component.extend({
         return '';
     }),
 
-    canSendEmail: computed('feature.labs.members', 'post.{displayName,email}', 'settings.{mailgunApiKey,mailgunDomain,mailgunBaseUrl}', 'config.mailgunIsConfigured', function () {
+    canSendEmail: computed('feature.labs.members', 'post.{isPost,email}', 'settings.{mailgunApiKey,mailgunDomain,mailgunBaseUrl}', 'config.mailgunIsConfigured', function () {
         let membersEnabled = this.feature.get('labs.members');
         let mailgunIsConfigured = this.get('settings.mailgunApiKey') && this.get('settings.mailgunDomain') && this.get('settings.mailgunBaseUrl') || this.get('config.mailgunIsConfigured');
-        let isPost = this.post.displayName === 'post';
+        let isPost = this.post.isPost;
         let hasSentEmail = !!this.post.email;
 
         return membersEnabled && mailgunIsConfigured && isPost && !hasSentEmail;
diff --git a/ghost/admin/app/components/gh-publishmenu-scheduled.js b/ghost/admin/app/components/gh-publishmenu-scheduled.js
index f4f356bd0e..b3dc254d56 100644
--- a/ghost/admin/app/components/gh-publishmenu-scheduled.js
+++ b/ghost/admin/app/components/gh-publishmenu-scheduled.js
@@ -46,10 +46,10 @@ export default Component.extend({
         return '';
     }),
 
-    canSendEmail: computed('feature.labs.members', 'post.{displayName,email}', 'settings.{mailgunApiKey,mailgunDomain,mailgunBaseUrl}', 'config.mailgunIsConfigured', function () {
+    canSendEmail: computed('feature.labs.members', 'post.{isPost,email}', 'settings.{mailgunApiKey,mailgunDomain,mailgunBaseUrl}', 'config.mailgunIsConfigured', function () {
         let membersEnabled = this.feature.get('labs.members');
         let mailgunIsConfigured = this.get('settings.mailgunApiKey') && this.get('settings.mailgunDomain') && this.get('settings.mailgunBaseUrl') || this.get('config.mailgunIsConfigured');
-        let isPost = this.post.displayName === 'post';
+        let isPost = this.post.isPost;
         let hasSentEmail = !!this.post.email;
 
         return membersEnabled && mailgunIsConfigured && isPost && !hasSentEmail;
diff --git a/ghost/admin/app/components/gh-publishmenu.js b/ghost/admin/app/components/gh-publishmenu.js
index 08fadfa850..7915976192 100644
--- a/ghost/admin/app/components/gh-publishmenu.js
+++ b/ghost/admin/app/components/gh-publishmenu.js
@@ -38,10 +38,10 @@ export default Component.extend({
 
     hasEmailPermission: or('session.user.isOwner', 'session.user.isAdmin', 'session.user.isEditor'),
 
-    canSendEmail: computed('feature.labs.members', 'post.{displayName,email}', 'settings.{mailgunApiKey,mailgunDomain,mailgunBaseUrl}', 'config.mailgunIsConfigured', function () {
+    canSendEmail: computed('feature.labs.members', 'post.{isPost,email}', 'settings.{mailgunApiKey,mailgunDomain,mailgunBaseUrl}', 'config.mailgunIsConfigured', function () {
         let membersEnabled = this.feature.get('labs.members');
         let mailgunIsConfigured = this.get('settings.mailgunApiKey') && this.get('settings.mailgunDomain') && this.get('settings.mailgunBaseUrl') || this.get('config.mailgunIsConfigured');
-        let isPost = this.post.displayName === 'post';
+        let isPost = this.post.isPost;
         let hasSentEmail = !!this.post.email;
 
         return membersEnabled && mailgunIsConfigured && isPost && !hasSentEmail;
diff --git a/ghost/admin/app/controllers/editor.js b/ghost/admin/app/controllers/editor.js
index 11aba8ea3b..f06dd7c38d 100644
--- a/ghost/admin/app/controllers/editor.js
+++ b/ghost/admin/app/controllers/editor.js
@@ -6,6 +6,7 @@ import isNumber from 'ghost-admin/utils/isNumber';
 import moment from 'moment';
 import {action, computed} from '@ember/object';
 import {alias, mapBy} from '@ember/object/computed';
+import {capitalize} from '@ember/string';
 import {inject as controller} from '@ember/controller';
 import {get} from '@ember/object';
 import {htmlSafe} from '@ember/string';
@@ -865,7 +866,7 @@ export default Controller.extend({
         let actions, type, path;
 
         if (status === 'published' || status === 'scheduled') {
-            type = this.get('post.displayName') === 'page' ? 'Page' : 'Post';
+            type = capitalize(this.get('post.displayName'));
             path = this.get('post.url');
             actions = `<a href="${path}" target="_blank">View ${type}</a>`;
         } else {
diff --git a/ghost/admin/app/models/post.js b/ghost/admin/app/models/post.js
index c951d0e368..10b68fd876 100644
--- a/ghost/admin/app/models/post.js
+++ b/ghost/admin/app/models/post.js
@@ -149,6 +149,9 @@ export default Model.extend(Comparable, ValidationEngine, {
     internalTags: filterBy('tags', 'isInternal', true),
     isScheduled: equal('status', 'scheduled'),
 
+    isPost: equal('displayName', 'post'),
+    isPage: equal('displayName', 'page'),
+
     willEmail: computed('emailRecipientFilter', function () {
         return this.emailRecipientFilter !== 'none';
     }),