diff --git a/src/lib/tools/scripts.cpp b/src/lib/tools/scripts.cpp
index 2bf05f50a..42f5fb9df 100644
--- a/src/lib/tools/scripts.cpp
+++ b/src/lib/tools/scripts.cpp
@@ -65,12 +65,12 @@ QString Scripts::setupFormObserver()
 {
     QString source = QL1S("(function() {"
                           "function findUsername(inputs) {"
-                          "    for (var i = 0; i < inputs.length; ++i)"
-                          "        if (inputs[i].type == 'text' && inputs[i].value.length && inputs[i].name.indexOf('user') != -1)"
-                          "            return inputs[i].value;"
-                          "    for (var i = 0; i < inputs.length; ++i)"
-                          "        if (inputs[i].type == 'text' && inputs[i].value.length && inputs[i].name.indexOf('name') != -1)"
-                          "            return inputs[i].value;"
+                          "    var usernameNames = ['user', 'name', 'login'];"
+                          "    for (var i = 0; i < usernameNames.length; ++i) {"
+                          "        for (var j = 0; j < inputs.length; ++j)"
+                          "            if (inputs[j].type == 'text' && inputs[j].value.length && inputs[j].name.indexOf(usernameNames[i]) != -1)"
+                          "                return inputs[j].value;"
+                          "    }"
                           "    for (var i = 0; i < inputs.length; ++i)"
                           "        if (inputs[i].type == 'text' && inputs[i].value.length)"
                           "            return inputs[i].value;"