diff --git a/shop-list/src/main/java/net/buggy/shoplist/ShopListActivity.java b/shop-list/src/main/java/net/buggy/shoplist/ShopListActivity.java
index 43e7975..fd6c2e9 100644
--- a/shop-list/src/main/java/net/buggy/shoplist/ShopListActivity.java
+++ b/shop-list/src/main/java/net/buggy/shoplist/ShopListActivity.java
@@ -203,11 +203,15 @@ protected void onPostExecute(Object o) {
     protected void attachBaseContext(Context newContext) {
         final Settings settings = getDataStorage().getSettings();
         final Language language = settings.getLanguage();
+
+        final Locale locale;
         if (language != null) {
-            Locale locale = new Locale(language.getLocale());
-            Locale.setDefault(locale);
-            newContext = ViewUtils.wrap(newContext, locale);
+            locale = new Locale(language.getLocale());
+        } else {
+            locale = ViewUtils.getSystemLocale();
         }
+        Locale.setDefault(locale);
+        newContext = ViewUtils.wrap(newContext, locale);
 
         super.attachBaseContext(CalligraphyContextWrapper.wrap(newContext));
     }
diff --git a/shop-list/src/main/java/net/buggy/shoplist/units/SettingsUnit.java b/shop-list/src/main/java/net/buggy/shoplist/units/SettingsUnit.java
index cbabcf4..e4b17a8 100644
--- a/shop-list/src/main/java/net/buggy/shoplist/units/SettingsUnit.java
+++ b/shop-list/src/main/java/net/buggy/shoplist/units/SettingsUnit.java
@@ -44,6 +44,7 @@ public void renderTo(ViewGroup parentView, final ShopListActivity activity) {
             languageField.setSelectedItem(settings.getLanguage());
             languageField.setStringConverter(new LanguageEnumStringifier(activity));
             languageField.setNullString(activity.getString(R.string.unit_settings_system_language));
+            languageField.setShowNullValue(true);
 
 
             final FloatingActionButton applyButton = (FloatingActionButton) parentView.findViewById(
diff --git a/shop-list/src/main/res/values-ru/strings.xml b/shop-list/src/main/res/values-ru/strings.xml
index 5556151..aa5cb11 100644
--- a/shop-list/src/main/res/values-ru/strings.xml
+++ b/shop-list/src/main/res/values-ru/strings.xml
@@ -108,7 +108,7 @@
     <string name="unit_edit_product_empty_name_not_allowed">Нужно указать название</string>
     <string name="unit_settings_title">Настройки</string>
     <string name="unit_settings_language_hint">Язык приложения</string>
-    <string name="unit_settings_system_language">Язык системы</string>
+    <string name="unit_settings_system_language">Автоматический</string>
     <string name="material_spinner_default_null_string">Не указано</string>
 
     <string name="default_product_apples">Яблоки</string>
diff --git a/shop-list/src/main/res/values/strings.xml b/shop-list/src/main/res/values/strings.xml
index 2a91bac..04e1593 100644
--- a/shop-list/src/main/res/values/strings.xml
+++ b/shop-list/src/main/res/values/strings.xml
@@ -105,7 +105,7 @@
     <string name="language_en" translatable="false">English</string>
     <string name="language_ru" translatable="false">Русский</string>
     <string name="unit_settings_language_hint">App language</string>
-    <string name="unit_settings_system_language">System language</string>
+    <string name="unit_settings_system_language">Automatic</string>
     <string name="material_spinner_default_null_string">None</string>
 
     <string name="default_product_apples">Apples</string>