diff --git a/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java b/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java
index 1a4bea4..e3b1942 100644
--- a/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java
+++ b/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java
@@ -12,6 +12,7 @@ import client.utils.ServerUtils;
 import commons.Recipe;
 
 import jakarta.inject.Inject;
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
@@ -234,18 +235,10 @@ public class FoodpalApplicationCtrl implements LocaleAware {
 
     // Language buttons
     @FXML
-    private void switchToEnglish() {
-        localeManager.setLocale(Locale.of("en"));
-    }
-
-    @FXML
-    private void switchToDutch() {
-        localeManager.setLocale(Locale.of("nl"));
-    }
-
-    @FXML
-    private void switchToPolish() {
-        localeManager.setLocale(Locale.of("pl"));
+    private void switchLocale(ActionEvent event) {
+        Button button = (Button)event.getSource();
+        String lang = (String)button.getUserData();
+        localeManager.setLocale(Locale.of(lang));
     }
 
     @FXML
diff --git a/client/src/main/resources/client/scenes/FoodpalApplication.fxml b/client/src/main/resources/client/scenes/FoodpalApplication.fxml
index 45ec08f..e779fff 100644
--- a/client/src/main/resources/client/scenes/FoodpalApplication.fxml
+++ b/client/src/main/resources/client/scenes/FoodpalApplication.fxml
@@ -44,9 +44,9 @@
                         <buttons>
                             <ToolBar prefHeight="35.0" prefWidth="123.0">
                                 <items>
-                                    <Button fx:id="flagEnButton" minWidth="33.0" onAction="#switchToEnglish" prefHeight="25.0" prefWidth="33.0" text="EN" />
-                                    <Button fx:id="flagNlButton" onAction="#switchToDutch" text="NL" />
-                                    <Button fx:id="flagPlButton" onAction="#switchToPolish" text="PL" />
+                                    <Button fx:id="flagEnButton" minWidth="33.0" onAction="#switchLocale" userData="en" prefHeight="25.0" prefWidth="33.0" text="EN" />
+                                    <Button fx:id="flagNlButton" onAction="#switchLocale" userData="nl" text="NL" />
+                                    <Button fx:id="flagPlButton" onAction="#switchLocale" userData="pl" text="PL" />
                                 </items>
                             </ToolBar>
                         </buttons>