diff --git a/components/WebsiteDetails.js b/components/WebsiteDetails.js
index 91217d78..eed69296 100644
--- a/components/WebsiteDetails.js
+++ b/components/WebsiteDetails.js
@@ -59,7 +59,7 @@ export default function WebsiteDetails({ websiteId }) {
       component: BrowsersTable,
     },
     {
-      label: <FormattedMessage id="metrics.operating-system" defaultMessage="Operating system" />,
+      label: <FormattedMessage id="metrics.operating-systems" defaultMessage="Operating system" />,
       value: 'os',
       component: OSTable,
     },
diff --git a/components/metrics/OSTable.js b/components/metrics/OSTable.js
index c94cf5c6..499e0f33 100644
--- a/components/metrics/OSTable.js
+++ b/components/metrics/OSTable.js
@@ -6,7 +6,7 @@ import { FormattedMessage } from 'react-intl';
 export default function OSTable({ websiteId, limit, onExpand }) {
   return (
     <MetricsTable
-      title={<FormattedMessage id="metrics.operating-system" defaultMessage="Operating system" />}
+      title={<FormattedMessage id="metrics.operating-systems" defaultMessage="Operating system" />}
       type="os"
       metric={<FormattedMessage id="metrics.visitors" defaultMessage="Visitors" />}
       websiteId={websiteId}
diff --git a/components/settings/AccountSettings.js b/components/settings/AccountSettings.js
index 355348ca..63f16350 100644
--- a/components/settings/AccountSettings.js
+++ b/components/settings/AccountSettings.js
@@ -51,7 +51,7 @@ export default function AccountSettings() {
     },
     {
       key: 'is_admin',
-      label: <FormattedMessage id="label.adminsitrator" defaultMessage="Administrator" />,
+      label: <FormattedMessage id="label.administrator" defaultMessage="Administrator" />,
       className: 'col-6 col-md-4',
       render: Checkmark,
     },
diff --git a/components/settings/ProfileSettings.js b/components/settings/ProfileSettings.js
index b58d7d32..0a0cd1c4 100644
--- a/components/settings/ProfileSettings.js
+++ b/components/settings/ProfileSettings.js
@@ -38,7 +38,9 @@ export default function ProfileSettings() {
         <dd>{user.username}</dd>
       </dl>
       {changePassword && (
-        <Modal title="Change password">
+        <Modal
+          title={<FormattedMessage id="button.change-password" defaultMessage="Change password" />}
+        >
           <ChangePasswordForm
             values={{ user_id }}
             onSave={handleSave}
diff --git a/lang/de-DE.json b/lang/de-DE.json
index e0186442..cd4b91b5 100644
--- a/lang/de-DE.json
+++ b/lang/de-DE.json
@@ -170,7 +170,7 @@
   "metrics.filter.raw": {
     "defaultMessage": "Rohdaten"
   },
-  "metrics.operating-system": {
+  "metrics.operating-systems": {
     "defaultMessage": "Betriebssystem"
   },
   "metrics.page-views": {
diff --git a/lang/en.json b/lang/en.json
index bcc7bcb4..2b81f2ab 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -170,8 +170,8 @@
   "metrics.filter.raw": {
     "defaultMessage": "Raw"
   },
-  "metrics.operating-system": {
-    "defaultMessage": "Operating system"
+  "metrics.operating-systems": {
+    "defaultMessage": "Operating systems"
   },
   "metrics.page-views": {
     "defaultMessage": "Page views"
diff --git a/lang/ja-JP.json b/lang/ja-JP.json
index 46f2a630..c3facd55 100644
--- a/lang/ja-JP.json
+++ b/lang/ja-JP.json
@@ -170,7 +170,7 @@
   "metrics.filter.raw": {
     "defaultMessage": "すべて表示"
   },
-  "metrics.operating-system": {
+  "metrics.operating-systems": {
     "defaultMessage": "OS"
   },
   "metrics.page-views": {
diff --git a/lang/nl-NL.json b/lang/nl-NL.json
index 8353e938..5987dd0c 100644
--- a/lang/nl-NL.json
+++ b/lang/nl-NL.json
@@ -170,7 +170,7 @@
   "metrics.filter.raw": {
     "defaultMessage": "Ruw"
   },
-  "metrics.operating-system": {
+  "metrics.operating-systems": {
     "defaultMessage": "Besturingssysteem"
   },
   "metrics.page-views": {
diff --git a/lang/ru-RU.json b/lang/ru-RU.json
index 6b5cb77a..62232b9e 100644
--- a/lang/ru-RU.json
+++ b/lang/ru-RU.json
@@ -170,7 +170,7 @@
   "metrics.filter.raw": {
     "defaultMessage": "Сырые данные"
   },
-  "metrics.operating-system": {
+  "metrics.operating-systems": {
     "defaultMessage": "Операционная система"
   },
   "metrics.page-views": {
diff --git a/lang/tr-TR.json b/lang/tr-TR.json
index cdeed558..eb7ba447 100644
--- a/lang/tr-TR.json
+++ b/lang/tr-TR.json
@@ -170,7 +170,7 @@
   "metrics.filter.raw": {
     "defaultMessage": "Ham"
   },
-  "metrics.operating-system": {
+  "metrics.operating-systems": {
     "defaultMessage": "İşletim sistemi"
   },
   "metrics.page-views": {
diff --git a/lang/zh-CN.json b/lang/zh-CN.json
index 7bea19ca..21817395 100644
--- a/lang/zh-CN.json
+++ b/lang/zh-CN.json
@@ -170,7 +170,7 @@
   "metrics.filter.raw": {
     "defaultMessage": "原始"
   },
-  "metrics.operating-system": {
+  "metrics.operating-systems": {
     "defaultMessage": "操作系统"
   },
   "metrics.page-views": {
diff --git a/lib/lang.js b/lib/lang.js
index 2ddb2e0f..9a2bb30c 100644
--- a/lib/lang.js
+++ b/lib/lang.js
@@ -31,11 +31,11 @@ export const dateLocales = {
 export const menuOptions = [
   { label: 'English', value: 'en', display: 'EN' },
   { label: '中文 (Chinese Simplified)', value: 'zh-CN', display: '中文' },
-  { label: 'Deutsch (German)', value: 'de-DE', display: 'DE' },
   { label: 'Nederlands (Dutch)', value: 'nl-NL', display: 'NL' },
+  { label: 'Deutsch (German)', value: 'de-DE', display: 'DE' },
+  { label: '日本語 (Japanese)', value: 'ja-JP', display: '日本語' },
   { label: 'Русский (Russian)', value: 'ru-RU', display: 'РУ' },
   { label: 'Turkish', value: 'tr-TR', display: 'TR' },
-  { label: '日本語 (Japanese)', value: 'ja-JP', display: 'JP' },
 ];
 
 export function dateFormat(date, str, locale) {