diff --git a/src/bundle/Controller/UserSettingsController.php b/src/bundle/Controller/UserSettingsController.php
index 3f82378..fbd4809 100644
--- a/src/bundle/Controller/UserSettingsController.php
+++ b/src/bundle/Controller/UserSettingsController.php
@@ -97,10 +97,13 @@ public function updateAction(Request $request, UpdateView $view)
                     $this->userSettingService->setUserSetting($identifier, (string)$value['value']);
                 }
 
+                $identifier = $data->getIdentifier();
+
                 $this->actionResultHandler->success(
                     /** @Desc("User settings '%identifier%' updated.") */
                     'user_setting.update.success',
-                    ['%identifier%' => $data->getIdentifier()],
+                    // To avoid breaking BC promise we are simply replacing flash message instead of redefining configuration
+                    ['%identifier%' => $identifier === 'location' ? 'locale' : $identifier],
                     'ibexa_user_settings'
                 );