diff --git a/changelog/83_UNRELEASED_xxxx-xx-xx.md b/changelog/83_UNRELEASED_xxxx-xx-xx.md
index 2fa92cc0..c20b9d48 100644
--- a/changelog/83_UNRELEASED_xxxx-xx-xx.md
+++ b/changelog/83_UNRELEASED_xxxx-xx-xx.md
@@ -50,7 +50,7 @@
 
 ### General
 
-- xxx
+- Fixed that it wasn't possible to log in using passwords containing non-latin characters
 
 ### API
 
diff --git a/public/viewjs/login.js b/public/viewjs/login.js
index b4777f11..976009c7 100644
--- a/public/viewjs/login.js
+++ b/public/viewjs/login.js
@@ -13,6 +13,6 @@ $("#login-button").on("click", function (e)
 {
 	e.preventDefault();
 
-	$("#password_base64").val(btoa($("#password_input").val()));
+	$("#password_base64").val(btoa(String.fromCharCode(...new TextEncoder().encode($("#password_input").val()))));
 	$("#login-form").trigger("submit");
 });
diff --git a/public/viewjs/userform.js b/public/viewjs/userform.js
index 46304abb..17339707 100644
--- a/public/viewjs/userform.js
+++ b/public/viewjs/userform.js
@@ -46,7 +46,7 @@ $('#save-user-button').on('click', function (e)
 		jsonData.picture_file_name = RandomString() + CleanFileName($("#user-picture")[0].files[0].name);
 	}
 
-	jsonData.password_base64 = btoa(jsonData.password);
+	jsonData.password_base64 = btoa(String.fromCharCode(...new TextEncoder().encode(jsonData.password)));
 	delete jsonData.password;
 	delete jsonData.password_confirm;
 	delete jsonData.change_password;