diff --git a/ghost/admin/app/controllers/settings/staff/user.js b/ghost/admin/app/controllers/settings/staff/user.js
index 8a89c026cb..6a9ac9ad06 100644
--- a/ghost/admin/app/controllers/settings/staff/user.js
+++ b/ghost/admin/app/controllers/settings/staff/user.js
@@ -4,8 +4,8 @@ import copyTextToClipboard from 'ghost-admin/utils/copy-text-to-clipboard';
 import isNumber from 'ghost-admin/utils/isNumber';
 import validator from 'validator';
 import windowProxy from 'ghost-admin/utils/window-proxy';
+import {action, computed} from '@ember/object';
 import {alias, and, not, or, readOnly} from '@ember/object/computed';
-import {computed} from '@ember/object';
 import {isArray as isEmberArray} from '@ember/array';
 import {run} from '@ember/runloop';
 import {inject as service} from '@ember/service';
@@ -381,6 +381,10 @@ export default Controller.extend({
         }
     },
 
+    toggleCommentNotifications: action(function (event) {
+        this.user.commentNotifications = event.target.checked;
+    }),
+
     _exportDb(filename) {
         this.utils.downloadFile(`${this.ghostPaths.url.api('db')}?filename=${filename}`);
     },
diff --git a/ghost/admin/app/models/user.js b/ghost/admin/app/models/user.js
index d8b2f22d78..602ee56d13 100644
--- a/ghost/admin/app/models/user.js
+++ b/ghost/admin/app/models/user.js
@@ -35,6 +35,7 @@ export default BaseModel.extend(ValidationEngine, {
     facebook: attr('facebook-url-user'),
     twitter: attr('twitter-url-user'),
     tour: attr('json-string'),
+    commentNotifications: attr(),
 
     ghostPaths: service(),
     ajax: service(),
diff --git a/ghost/admin/app/templates/settings/staff/user.hbs b/ghost/admin/app/templates/settings/staff/user.hbs
index 3d3e66d5a5..ace16741dc 100644
--- a/ghost/admin/app/templates/settings/staff/user.hbs
+++ b/ghost/admin/app/templates/settings/staff/user.hbs
@@ -292,7 +292,7 @@
                             />
                             <GhErrorMessage @errors={{this.user.errors}} @property="bio" data-test-error="user-bio" />
                             <p>
-                                Recommended: <strong>200</strong> characters. 
+                                Recommended: <strong>200</strong> characters.
                                 You've used {{gh-count-down-characters this.user.bio 200}}
                             </p>
                         </GhFormGroup>
@@ -306,15 +306,15 @@
                                     <p>Send notifications on members commenting on your posts</p>
                                 </div>
                                 <div class="for-switch">
-                                    <label class="switch" for={{notifications.comment}}>
-                                        <Input
-                                            {{!-- @checked={{newsletter.subscribed}} --}}
-                                            @type="checkbox"
-                                            id={{notifications.comment}}
-                                            name="comment-emails"
-                                            data-test-checkbox="member-subscribed"
-                                            {{!-- {{on "click" (fn this.updateNewsletterPreference newsletter)}} --}}
-                                        />
+                                    <label class="switch" for="comment-notifications">
+                                        <input
+                                            id="comment-notifications"
+                                            type="checkbox"
+                                            checked={{this.user.commentNotifications}}
+                                            class="gh-input"
+                                            {{on "change" this.toggleCommentNotifications}}
+                                            data-test-checkbox="comment-notifications"
+                                        >
                                         <span class="input-toggle-component"></span>
                                     </label>
                                 </div>