diff --git a/Riot/AppDelegate.m b/Riot/AppDelegate.m
index ee993eec6..5a033cba6 100644
--- a/Riot/AppDelegate.m
+++ b/Riot/AppDelegate.m
@@ -291,7 +291,12 @@ NSString *const kAppDelegateNetworkStatusDidChangeNotification = @"kAppDelegateN
     NSLog(@"MatrixSDK version: %@", MatrixSDKVersion);
     NSLog(@"Build: %@\n", build);
     NSLog(@"------------------------------\n");
-    
+
+    // Set up runtime language and fallback
+    NSString *langage = [[NSUserDefaults standardUserDefaults] objectForKey:@"appLanguage"];;
+    [NSBundle mxk_setLanguage:langage];
+    [NSBundle mxk_setFallbackLanguage:@"en"];
+
     // Define the navigation bar text color
     [[UINavigationBar appearance] setTintColor:kRiotColorGreen];
     
diff --git a/Riot/ViewController/BugReportViewController.m b/Riot/ViewController/BugReportViewController.m
index b9087d541..76613b993 100644
--- a/Riot/ViewController/BugReportViewController.m
+++ b/Riot/ViewController/BugReportViewController.m
@@ -238,6 +238,7 @@
 
     userInfo[@"locale"] = [NSLocale preferredLanguages][0];
     userInfo[@"app_language"] = [[NSBundle mainBundle] preferredLocalizations][0];
+    //TODO
 
     bugReportRestClient.others = userInfo;
 
diff --git a/Riot/ViewController/SettingsViewController.m b/Riot/ViewController/SettingsViewController.m
index 5b09b69f6..77a86d47f 100644
--- a/Riot/ViewController/SettingsViewController.m
+++ b/Riot/ViewController/SettingsViewController.m
@@ -3523,6 +3523,10 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
     {
         [NSBundle mxk_setLanguage:language];
 
+        // Store user settings
+        [[NSUserDefaults standardUserDefaults] setObject:language forKey:@"appLanguage"];
+        [[NSUserDefaults standardUserDefaults] synchronize];
+
         // Do a full sync to recompute room summaries
         // TODO: resetting room summaries and room data sources should be enough
         [self startActivityIndicator];