diff --git a/accounts/__init__.py b/accounts/__init__.py
index 744ce0a..41d3eda 100644
--- a/accounts/__init__.py
+++ b/accounts/__init__.py
@@ -53,15 +53,12 @@ def change_theme():
 
     @app.get("/change-lang")
     def change_lang():
-        lang = request.args.get("lang", app.config["BABEL_DEFAULT_LOCALE"])
-
+        lang = request.args.get("l", app.config["BABEL_DEFAULT_LOCALE"])
         if lang in app.config["LANGUAGES"]:
             # not sure why both?
             session["_lang_preference"] = lang
-            app.config["BABEL_LOCALE"] = lang
         else:
             session["_lang_preference"] = app.config["BABEL_DEFAULT_LOCALE"]
-            app.config["BABEL_LOCALE"] = app.config["BABEL_DEFAULT_LOCALE"]
         return redirect(url_for("accounts.index"))
 
     return app
@@ -131,6 +128,15 @@ def config_extention(app):
     csrf.init_app(app)
     mail.init_app(app)
     oauth.init_app(app)
+
+    def get_locale():
+        if session.get("_lang_preference", None):
+            return session["_lang_preference"]
+        else:
+            session["_lang_preference"] = request.accept_languages.best_match(
+                app.config["LANGUAGES"]
+            )
+
     babel.init_app(app, locale_selector=get_locale)
 
     config_login_manager(login_manager)
diff --git a/accounts/templates/base.html b/accounts/templates/base.html
index 7416fa2..5a5775f 100644
--- a/accounts/templates/base.html
+++ b/accounts/templates/base.html
@@ -67,9 +67,11 @@ <h5 class="text-uppercase m-0">Flask Auth</h5>
             <ul class="dropdown-menu">
               {% for lang in config["LANGUAGES"] %}
               <li>
-                <a class="dropdown-item d-flex" href="{{ url_for('change_lang', lang=lang) }}">
+                <a class="dropdown-item d-flex" href="{{ url_for('change_lang', l=lang) }}">
                   {{ lang }}
-                  {% if session.get('_lang_preference') == lang %}
+                  {% if session.get('_lang_preference', none) is none and theme == 'en' %}
+                  <i class="bi bi-check-circle-fill ms-auto"></i>
+                  {% elif session.get('_lang_preference') == lang %}
                   <i class="bi bi-check-circle-fill ms-auto"></i>
                   {% endif %}
                 </a>
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
old mode 100644
new mode 100755