diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0ebd829b..2b2bfd49 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,7 +8,7 @@
     },
     "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
-        "source.organizeImports": true
+        "source.organizeImports": "explicit"
     },
     "typescript.referencesCodeLens.enabled": true,
     "tslint.ignoreDefinitionFiles": false,
diff --git a/src/containers/Login.tsx b/src/containers/Login.tsx
index b2b6e0fc..8b9a131c 100644
--- a/src/containers/Login.tsx
+++ b/src/containers/Login.tsx
@@ -1,11 +1,12 @@
 import { LockOutlined } from '@ant-design/icons'
-import { Button, Card, Collapse, Input, Radio, Row, Layout, Select } from 'antd'
+import { Button, Card, Collapse, Input, Layout, Radio, Row, Select } from 'antd'
 import React, { ReactComponentElement } from 'react'
 import { Redirect, RouteComponentProps } from 'react-router'
 import ApiManager from '../api/ApiManager'
 import ErrorFactory from '../utils/ErrorFactory'
 import {
     currentLanguageOption,
+    isLanguageEnabled,
     languagesOptions,
     localize,
 } from '../utils/Language'
@@ -81,16 +82,18 @@ export default class Login extends ApiComponent<RouteComponentProps<any>, any> {
                         )}
                         style={{ width: 380 }}
                         extra={
-                            <Select
-                                options={languagesOptions}
-                                value={currentLanguageOption.value}
-                                onChange={(value) => {
-                                    StorageHelper.setLanguageInLocalStorage(
-                                        value
-                                    )
-                                    window.location.reload()
-                                }}
-                            />
+                            isLanguageEnabled ? (
+                                <Select
+                                    options={languagesOptions}
+                                    value={currentLanguageOption.value}
+                                    onChange={(value) => {
+                                        StorageHelper.setLanguageInLocalStorage(
+                                            value
+                                        )
+                                        window.location.reload()
+                                    }}
+                                />
+                            ) : undefined
                         }
                     >
                         <NormalLoginForm
diff --git a/src/containers/apps/CreateNewApp.tsx b/src/containers/apps/CreateNewApp.tsx
index 9dea7184..2a9aa6d5 100644
--- a/src/containers/apps/CreateNewApp.tsx
+++ b/src/containers/apps/CreateNewApp.tsx
@@ -100,7 +100,10 @@ class CreateNewApp extends Component<
                             })
                         }
                     >
-                        Has Persistent Data
+                        {localize(
+                            'create_new_app.has_persistent_data',
+                            'Has Persistent Data'
+                        )}{' '}
                     </Checkbox>
                     &nbsp;&nbsp;
                     <Tooltip
diff --git a/src/utils/Language.ts b/src/utils/Language.ts
index a1153f10..23629cd8 100644
--- a/src/utils/Language.ts
+++ b/src/utils/Language.ts
@@ -46,3 +46,6 @@ export function localize(key: string, message: string) {
 }
 
 export { currentLanguageOption, languagesOptions }
+
+// Currently only enable language for dev mode, until the vast majority of the content is translated
+export const isLanguageEnabled = !!process.env.REACT_APP_IS_DEBUG