diff --git a/static/webui/index.html b/static/webui/index.html
index eb131de2..65a9d832 100644
--- a/static/webui/index.html
+++ b/static/webui/index.html
@@ -85,6 +85,7 @@
                     <input class="form-control" type="password" id="password" required />
                     <br />
                     <button class="btn btn-primary" type="submit" data-loc="login_loginButton"></button>
+                    <button class="btn btn-secondary" type="submit" onclick="registerSubmit = true;" data-loc="login_registerButton"></button>
                 </form>
             </div>
             <div data-route="/webui/inventory" data-title="Inventory | OpenWF WebUI">
diff --git a/static/webui/script.js b/static/webui/script.js
index 562591fb..7868e189 100644
--- a/static/webui/script.js
+++ b/static/webui/script.js
@@ -1,8 +1,15 @@
+let loginOrRegisterPending = false;
+window.registerSubmit = false;
+
 function doLogin() {
+    if (loginOrRegisterPending) {
+        return;
+    }
+    loginOrRegisterPending = true;
     localStorage.setItem("email", $("#email").val());
     localStorage.setItem("password", $("#password").val());
-    $("#email, #password").val("");
     loginFromLocalStorage();
+    registerSubmit = false;
 }
 
 function loginFromLocalStorage() {
@@ -37,12 +44,15 @@ function doLoginRequest(succ_cb, fail_cb) {
             s: "W0RFXVN0ZXZlIGxpa2VzIGJpZyBidXR0cw==", // signature of some kind
             lang: "en",
             date: 1501230947855458660, // ???
-            ClientType: "webui",
+            ClientType: registerSubmit ? "" : "webui",
             PS: "W0RFXVN0ZXZlIGxpa2VzIGJpZyBidXR0cw==" // anti-cheat data
         })
     });
     req.done(succ_cb);
     req.fail(fail_cb);
+    req.always(() => {
+        loginOrRegisterPending = false;
+    });
 }
 
 function revalidateAuthz(succ_cb) {
diff --git a/static/webui/translations/de.js b/static/webui/translations/de.js
index 73ffcc83..b8725e00 100644
--- a/static/webui/translations/de.js
+++ b/static/webui/translations/de.js
@@ -60,6 +60,7 @@ dict = {
     login_emailLabel: `E-Mail-Adresse`,
     login_passwordLabel: `Passwort`,
     login_loginButton: `Anmelden`,
+    login_registerButton: `[UNTRANSLATED] Register`,
     navbar_logout: `Abmelden`,
     navbar_renameAccount: `Account umbenennen`,
     navbar_deleteAccount: `Account löschen`,
diff --git a/static/webui/translations/en.js b/static/webui/translations/en.js
index dc895457..23b8133a 100644
--- a/static/webui/translations/en.js
+++ b/static/webui/translations/en.js
@@ -59,6 +59,7 @@ dict = {
     login_emailLabel: `Email address`,
     login_passwordLabel: `Password`,
     login_loginButton: `Login`,
+    login_registerButton: `Register`,
     navbar_logout: `Logout`,
     navbar_renameAccount: `Rename Account`,
     navbar_deleteAccount: `Delete Account`,
diff --git a/static/webui/translations/es.js b/static/webui/translations/es.js
index 24eed094..222534cd 100644
--- a/static/webui/translations/es.js
+++ b/static/webui/translations/es.js
@@ -60,6 +60,7 @@ dict = {
     login_emailLabel: `Dirección de correo electrónico`,
     login_passwordLabel: `Contraseña`,
     login_loginButton: `Iniciar sesión`,
+    login_registerButton: `[UNTRANSLATED] Register`,
     navbar_logout: `Cerrar sesión`,
     navbar_renameAccount: `Renombrar cuenta`,
     navbar_deleteAccount: `Eliminar cuenta`,
diff --git a/static/webui/translations/fr.js b/static/webui/translations/fr.js
index e174ec7d..682086aa 100644
--- a/static/webui/translations/fr.js
+++ b/static/webui/translations/fr.js
@@ -60,6 +60,7 @@ dict = {
     login_emailLabel: `Email`,
     login_passwordLabel: `Mot de passe`,
     login_loginButton: `Connexion`,
+    login_registerButton: `[UNTRANSLATED] Register`,
     navbar_logout: `Déconnexion`,
     navbar_renameAccount: `Renommer le compte`,
     navbar_deleteAccount: `Supprimer le compte`,
diff --git a/static/webui/translations/ru.js b/static/webui/translations/ru.js
index e3862a26..959678f3 100644
--- a/static/webui/translations/ru.js
+++ b/static/webui/translations/ru.js
@@ -60,6 +60,7 @@ dict = {
     login_emailLabel: `Адрес электронной почты`,
     login_passwordLabel: `Пароль`,
     login_loginButton: `Войти`,
+    login_registerButton: `[UNTRANSLATED] Register`,
     navbar_logout: `Выйти`,
     navbar_renameAccount: `Переименовать аккаунт`,
     navbar_deleteAccount: `Удалить аккаунт`,
diff --git a/static/webui/translations/zh.js b/static/webui/translations/zh.js
index ae832c7d..3f0e01f5 100644
--- a/static/webui/translations/zh.js
+++ b/static/webui/translations/zh.js
@@ -60,6 +60,7 @@ dict = {
     login_emailLabel: `电子邮箱`,
     login_passwordLabel: `密码`,
     login_loginButton: `登录`,
+    login_registerButton: `[UNTRANSLATED] Register`,
     navbar_logout: `退出登录`,
     navbar_renameAccount: `重命名账户`,
     navbar_deleteAccount: `删除账户`,