Fix user self-deletion (#7626)

* Fix user self-deletion

* Minor code cleanup

1 files changed, 2 insertions, 6 deletions

diff --git a/p/scripts/extra.js b/p/scripts/extra.js
index cfd1cef4d..e19e1e899 100644
--- a/p/scripts/extra.js
+++ b/p/scripts/extra.js
@@ -33,7 +33,7 @@ function init_crypto_form() {
 
 	forgetOpenCategories();
 
-	const submit_button = document.getElementById('loginButton');
+	const submit_button = crypto_form.querySelector('[type="submit"]');
 	if (submit_button) {
 		submit_button.disabled = false;
 	}
@@ -46,11 +46,6 @@ function init_crypto_form() {
 		}
 		submit_button.disabled = true;
 
-		if (document.getElementById('challenge').value)	{
-			// Already computed
-			return true;
-		}
-
 		const req = new XMLHttpRequest();
 		req.open('GET', './?c=javascript&a=nonce&user=' + document.getElementById('username').value, true);
 
@@ -83,6 +78,7 @@ function init_crypto_form() {
 			} else {
 				req.onerror();
 			}
+			submit_button.disabled = false;
 		};
 
 		req.send();