diff --git a/lib/AccountManager/App.pm b/lib/AccountManager/App.pm
index 538fbb3bdab0e3fb222587bd9cac16af07a075d9..1be235c5090d17cbd5f3c921236382fbac4b157c 100644
--- a/lib/AccountManager/App.pm
+++ b/lib/AccountManager/App.pm
@@ -74,8 +74,10 @@ sub new {
         $self->{logger}->debugf("setting language from parameter: %s", $lang);
     } elsif ($lang = $cookies->{lang} ? $cookies->{lang}->value() : undef) {
         $self->{logger}->debugf("setting language from cookie: %s", $lang);
+    } elsif ($lang = $ENV{HTTP_ACCEPT_LANGUAGE}) {
+        $self->{logger}->debugf("setting language from HTTP_ACCEPT_LANGUAGE header: %s", $lang);
     } else {
-        $self->{logger}->debugf("setting language from HTTP_ACCEPT_LANGUAGE header: %s", $ENV{HTTP_ACCEPT_LANGUAGE});
+        $self->{logger}->debugf("using default language");
     }
     $self->{lh} = AccountManager::L10N->get_handle($lang ? $lang: ());
     if (!$self->{lh}) {