diff --git a/CHANGES b/CHANGES
index f98ffbda0..2619344a9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -36,7 +36,8 @@ This release contains contributions from (alphabetically by first name):
 
 This is **another** hotfix release for issues around autologin ..
 autoLogin, really, since the whole problem is that internal capitalization
-changed. (Reported by pcrepix, #1668)
+changed. An unrelated bug in writing /etc/default/keyboard was
+also fixed. (Reported by pcrepix, #1668)
 
 
 # 3.2.39.1 (2021-03-30) #
diff --git a/lang/python/de/LC_MESSAGES/python.po b/lang/python/de/LC_MESSAGES/python.po
index 44d7603fa..860368871 100644
--- a/lang/python/de/LC_MESSAGES/python.po
+++ b/lang/python/de/LC_MESSAGES/python.po
@@ -5,7 +5,7 @@
 # 
 # Translators:
 # Adriaan de Groot <groot@kde.org>, 2020
-# Christian Spaan, 2020
+# Gustav Gyges, 2020
 # Andreas Eitel <github-aneitel@online.de>, 2020
 # 
 #, fuzzy
diff --git a/src/modules/locale/Config.cpp b/src/modules/locale/Config.cpp
index 1417e5b89..854d65eef 100644
--- a/src/modules/locale/Config.cpp
+++ b/src/modules/locale/Config.cpp
@@ -259,8 +259,7 @@ Config::setCurrentLocation( const CalamaresUtils::Locale::TimeZoneData* location
         auto newLocale = automaticLocaleConfiguration();
         if ( !m_selectedLocaleConfiguration.explicit_lang )
         {
-            m_selectedLocaleConfiguration.setLanguage( newLocale.language() );
-            emit currentLanguageStatusChanged( currentLanguageStatus() );
+            setLanguage( newLocale.language() );
         }
         if ( !m_selectedLocaleConfiguration.explicit_lc )
         {
@@ -302,11 +301,20 @@ Config::localeConfiguration() const
 void
 Config::setLanguageExplicitly( const QString& language )
 {
-    m_selectedLocaleConfiguration.setLanguage( language );
     m_selectedLocaleConfiguration.explicit_lang = true;
+    setLanguage( language );
+}
 
-    emit currentLanguageStatusChanged( currentLanguageStatus() );
-    emit currentLanguageCodeChanged( currentLanguageCode() );
+void
+Config::setLanguage( const QString& language )
+{
+    if ( language != m_selectedLocaleConfiguration.language() )
+    {
+        m_selectedLocaleConfiguration.setLanguage( language );
+
+        emit currentLanguageStatusChanged( currentLanguageStatus() );
+        emit currentLanguageCodeChanged( currentLanguageCode() );
+    }
 }
 
 void
diff --git a/src/modules/locale/Config.h b/src/modules/locale/Config.h
index 4383f6bb0..bcdaf0bbf 100644
--- a/src/modules/locale/Config.h
+++ b/src/modules/locale/Config.h
@@ -95,6 +95,8 @@ private:
     }
 
 public Q_SLOTS:
+    /// Set the language, but do not mark it as user-choice
+    void setLanguage( const QString& language );
     /// Set a language by user-choice, overriding future location changes
     void setLanguageExplicitly( const QString& language );
     /// Set LC (formats) by user-choice, overriding future location changes