diff --git a/rust/agama-server/src/web/http.rs b/rust/agama-server/src/web/http.rs
index 2648d45920..63267051f5 100644
--- a/rust/agama-server/src/web/http.rs
+++ b/rust/agama-server/src/web/http.rs
@@ -100,8 +100,8 @@ pub async fn login(
 pub struct LoginFromQueryParams {
     /// Token to use for authentication.
     token: String,
-    /// Requested locale
-    lang: String,
+    /// Optional requested locale
+    lang: Option<String>,
 }
 
 #[utoipa::path(get, path = "/login", responses(
@@ -126,8 +126,10 @@ pub async fn login_from_query(
     let mut target = String::from("/");
 
     // keep the "lang" URL query if it was present in the original request
-    if !&params.lang.is_empty() {
-        target.push_str(format!("?lang={}", params.lang).as_str());
+    if let Some(lang) = params.lang {
+        if !lang.is_empty() {
+            target.push_str(format!("?lang={}", lang).as_str());
+        }
     }
 
     let location = HeaderValue::from_str(target.as_str());
diff --git a/rust/package/agama.changes b/rust/package/agama.changes
index 598efe8dba..64ce120097 100644
--- a/rust/package/agama.changes
+++ b/rust/package/agama.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb 10 13:28:34 UTC 2025 - Ladislav Slezák <lslezak@suse.com>
+
+- Fixup: Make the "lang" URL query optional, do not fail when it
+  is missing. This fixes crash on non-UEFI systems.
+
 -------------------------------------------------------------------
 Fri Feb  7 11:03:29 UTC 2025 - Ladislav Slezák <lslezak@suse.com>