diff --git a/src/browser/components/SettingsPage.jsx b/src/browser/components/SettingsPage.jsx
index f351501c..33d555e1 100644
--- a/src/browser/components/SettingsPage.jsx
+++ b/src/browser/components/SettingsPage.jsx
@@ -9,12 +9,13 @@ const AutoLaunch = require('auto-launch');
 const {debounce} = require('underscore');
 
 const settings = require('../../common/settings');
+const appName = require('../../package.json').productName;
 
 const TeamList = require('./TeamList.jsx');
 const AutoSaveIndicator = require('./AutoSaveIndicator.jsx');
 
 const appLauncher = new AutoLaunch({
-  name: 'Mattermost',
+  name: appName,
   isHidden: true
 });
 
diff --git a/src/browser/settings.jsx b/src/browser/settings.jsx
index ec1a9867..dd88bc40 100644
--- a/src/browser/settings.jsx
+++ b/src/browser/settings.jsx
@@ -1,7 +1,8 @@
 'use strict';
+const appName = require('../package.json').productName;
 
 window.eval = global.eval = () => {
-  throw new Error('Sorry, Mattermost does not support window.eval() for security reasons.');
+  throw new Error(`Sorry, ${appName} does not support window.eval() for security reasons.`);
 };
 
 const {remote} = require('electron');
diff --git a/src/main/squirrelStartup.js b/src/main/squirrelStartup.js
index 43fb3a30..a1eb2d54 100644
--- a/src/main/squirrelStartup.js
+++ b/src/main/squirrelStartup.js
@@ -1,4 +1,5 @@
 const AutoLaunch = require('auto-launch');
+const appName = require('../package.json').productName;
 
 function shouldQuitApp(cmd) {
   if (process.platform !== 'win32') {
@@ -9,7 +10,7 @@ function shouldQuitApp(cmd) {
 
 async function setupAutoLaunch(cmd) {
   const appLauncher = new AutoLaunch({
-    name: 'Mattermost',
+    name: appName, 
     isHidden: true
   });
   if (cmd === '--squirrel-uninstall') {