diff --git a/Riot/ViewController/BugReportViewController.m b/Riot/ViewController/BugReportViewController.m
index 76613b993..fb38f491e 100644
--- a/Riot/ViewController/BugReportViewController.m
+++ b/Riot/ViewController/BugReportViewController.m
@@ -237,8 +237,8 @@
     }
 
     userInfo[@"locale"] = [NSLocale preferredLanguages][0];
-    userInfo[@"app_language"] = [[NSBundle mainBundle] preferredLocalizations][0];
-    //TODO
+    userInfo[@"default_app_language"] = [[NSBundle mainBundle] preferredLocalizations][0]; // The language chosen by the OS
+    userInfo[@"app_language"] = [NSBundle mxk_language] ? [NSBundle mxk_language] : userInfo[@"default_app_language"]; // The language chosen by the user
 
     bugReportRestClient.others = userInfo;