diff --git a/bin/locale/de_DE.qm b/bin/locale/de_DE.qm
index 7c6f34bfa..5f87d963e 100644
Binary files a/bin/locale/de_DE.qm and b/bin/locale/de_DE.qm differ
diff --git a/src/autofill/autofillmodel.cpp b/src/autofill/autofillmodel.cpp
index 6f8693b37..728898ffd 100644
--- a/src/autofill/autofillmodel.cpp
+++ b/src/autofill/autofillmodel.cpp
@@ -259,12 +259,12 @@ QString AutoFillModel::getValueFromData(const QByteArray &data, QWebElement elem
 
     QString value = element.evaluateJavaScript("this.value").toString();
     if (value.isEmpty()) {
-        QueryItems queryItems = QUrl("http://a.b/?" + data).queryItems();
+        QueryItems queryItems = QUrl::fromEncoded("http://a.b/?" + data).queryItems();
         for (int i = 0; i < queryItems.count(); i++) {
             QueryItem item = queryItems.at(i);
 
             if (item.first == name) {
-                value = item.second;
+                value = item.second.toAscii();
             }
         }
     }
@@ -274,7 +274,7 @@ QString AutoFillModel::getValueFromData(const QByteArray &data, QWebElement elem
 
 bool AutoFillModel::dataContains(const QByteArray &data, const QString &attributeName)
 {
-    QueryItems queryItems = QUrl("http://a.b/?" + data).queryItems();
+    QueryItems queryItems = QUrl::fromEncoded("http://a.b/?" + data).queryItems();
     for (int i = 0; i < queryItems.count(); i++) {
         QueryItem item = queryItems.at(i);
 
diff --git a/src/preferences/autofillmanager.cpp b/src/preferences/autofillmanager.cpp
index 7b1137ea1..641b73ee3 100644
--- a/src/preferences/autofillmanager.cpp
+++ b/src/preferences/autofillmanager.cpp
@@ -140,9 +140,9 @@ void AutoFillManager::editPass()
         query.exec();
         query.next();
 
-        QString data = query.value(0).toString();
-        QString oldPass = "=" + query.value(1).toString();
-        data.replace(oldPass, "=" + text);
+        QByteArray data = query.value(0).toByteArray();
+        QByteArray oldPass = "=" + QUrl::toPercentEncoding(query.value(1).toByteArray());
+        data.replace(oldPass, "=" + QUrl::toPercentEncoding(text.toAscii()));
 
         query.prepare("UPDATE autofill SET data=?, password=? WHERE id=?");
         query.bindValue(0, data);
diff --git a/src/preferences/autofillmanager.h b/src/preferences/autofillmanager.h
index 0b435a8d5..07cbe4319 100644
--- a/src/preferences/autofillmanager.h
+++ b/src/preferences/autofillmanager.h
@@ -26,6 +26,7 @@
 #include <QDebug>
 #include <QMessageBox>
 #include <QInputDialog>
+#include <QUrl>
 
 namespace Ui
 {
diff --git a/translations/cs_CZ.ts b/translations/cs_CZ.ts
index 17af2659b..fb5a214cd 100644
--- a/translations/cs_CZ.ts
+++ b/translations/cs_CZ.ts
@@ -4179,7 +4179,7 @@ Po přidání či odstranění cest k certifikátům je nutné k projevení změ
         <translation>Zkusit znovu</translation>
     </message>
     <message>
-        <location filename="../src/webview/webpage.cpp" line="483"/>
+        <location filename="../src/webview/webpage.cpp" line="447"/>
         <source>Choose file...</source>
         <translation>Vyberte soubor...</translation>
     </message>
diff --git a/translations/de_DE.ts b/translations/de_DE.ts
index 11809712c..271b6e0c3 100644
--- a/translations/de_DE.ts
+++ b/translations/de_DE.ts
@@ -4178,7 +4178,7 @@ Nachdem Speicherpfade hinzugefügt oder gelöscht wurden, muss QupZilla neu gest
         <translation>Erneut versuchen</translation>
     </message>
     <message>
-        <location filename="../src/webview/webpage.cpp" line="483"/>
+        <location filename="../src/webview/webpage.cpp" line="447"/>
         <source>Choose file...</source>
         <translation>Datei wählen...</translation>
     </message>
diff --git a/translations/es.ts b/translations/es.ts
index 0c79a6d3a..7fc0bf0bf 100644
--- a/translations/es.ts
+++ b/translations/es.ts
@@ -4175,7 +4175,7 @@ Después de añadir o eliminar rutas de certificados, es necesario reiniciar el
         <translation>Volver a intentar</translation>
     </message>
     <message>
-        <location filename="../src/webview/webpage.cpp" line="483"/>
+        <location filename="../src/webview/webpage.cpp" line="447"/>
         <source>Choose file...</source>
         <translation>Elegir archivo...</translation>
     </message>
diff --git a/translations/it_IT.ts b/translations/it_IT.ts
index e6cdd1d24..9e4b5fd89 100644
--- a/translations/it_IT.ts
+++ b/translations/it_IT.ts
@@ -4179,7 +4179,7 @@ Dopo l&apos;aggiunta o la rimozione dei percorsi di certificazione, è necessari
         <translation>Prova di nuovo</translation>
     </message>
     <message>
-        <location filename="../src/webview/webpage.cpp" line="483"/>
+        <location filename="../src/webview/webpage.cpp" line="447"/>
         <source>Choose file...</source>
         <translation>Scegli il file...</translation>
     </message>
diff --git a/translations/nl_NL.ts b/translations/nl_NL.ts
index fc65348af..ac735e5c1 100644
--- a/translations/nl_NL.ts
+++ b/translations/nl_NL.ts
@@ -4179,7 +4179,7 @@ Na het toevoegen of verwijderen van paden, is het noodzakelijk om de browser te
         <translation>Probeer nogmaals</translation>
     </message>
     <message>
-        <location filename="../src/webview/webpage.cpp" line="483"/>
+        <location filename="../src/webview/webpage.cpp" line="447"/>
         <source>Choose file...</source>
         <translation>Kies bestand...</translation>
     </message>
diff --git a/translations/sk_SK.ts b/translations/sk_SK.ts
index b62977bb1..fce5b8675 100644
--- a/translations/sk_SK.ts
+++ b/translations/sk_SK.ts
@@ -4176,7 +4176,7 @@ Po pridaní či odobratí ciest k certifikátom je nutné reštartovať prehliad
         <translation>Skúsiť znova</translation>
     </message>
     <message>
-        <location filename="../src/webview/webpage.cpp" line="483"/>
+        <location filename="../src/webview/webpage.cpp" line="447"/>
         <source>Choose file...</source>
         <translation>Vybrať súbor...</translation>
     </message>
diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts
index 56db62e7d..2f85f494b 100644
--- a/translations/zh_CN.ts
+++ b/translations/zh_CN.ts
@@ -4171,7 +4171,7 @@ After adding or removing certificate paths, it is neccessary to restart browser
         <translation>再试一次</translation>
     </message>
     <message>
-        <location filename="../src/webview/webpage.cpp" line="483"/>
+        <location filename="../src/webview/webpage.cpp" line="447"/>
         <source>Choose file...</source>
         <translation>选择文件...</translation>
     </message>