diff -r 3d16ad54b3dc -r 0a658e53177c src/main/java/de/uapcore/lightpit/modules/LanguageModule.java
--- a/src/main/java/de/uapcore/lightpit/modules/LanguageModule.java	Sat May 30 18:12:38 2020 +0200
+++ b/src/main/java/de/uapcore/lightpit/modules/LanguageModule.java	Mon Jun 01 14:46:58 2020 +0200
@@ -29,6 +29,7 @@
 package de.uapcore.lightpit.modules;
 
 import de.uapcore.lightpit.*;
+import de.uapcore.lightpit.viewmodel.LanguageView;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -86,9 +87,12 @@
     @RequestMapping(method = HttpMethod.GET)
     public ResponseType handle(HttpServletRequest req) {
 
-        req.setAttribute("languages", languages);
-        req.setAttribute("browserLanguage", req.getLocale());
+        final var viewModel = new LanguageView();
+        viewModel.setLanguages(languages);
+        viewModel.setBrowserLanguage(req.getLocale());
+        viewModel.setCurrentLanguage((Locale)req.getSession().getAttribute(Constants.SESSION_ATTR_LANGUAGE));
 
+        setViewModel(req, viewModel);
         setStylesheet(req, "language");
         setContentPage(req, "language");
         return ResponseType.HTML;