diff --git a/api/js/etemplate/Et2Textbox/Et2Password.ts b/api/js/etemplate/Et2Textbox/Et2Password.ts
index 86feddd275..1dd5004474 100644
--- a/api/js/etemplate/Et2Textbox/Et2Password.ts
+++ b/api/js/etemplate/Et2Textbox/Et2Password.ts
@@ -93,7 +93,7 @@ export class Et2Password extends Et2InvokerMixin(Et2Textbox)
 		if (this._invokerNode)
 		{
 			const invokerNode = /** @type {HTMLElement & {disabled: boolean}} */ (this._invokerNode);
-			invokerNode.disabled = this.disabled;
+			invokerNode.disabled = this.disabled || this.readonly;
 		}
 	}
 
@@ -164,6 +164,8 @@ export class Et2Password extends Et2InvokerMixin(Et2Textbox)
 			return;
 		}
 
+		if (this.plaintext) return;	// no need to query user-password, if the password is plaintext
+
 		// Need username & password to decrypt
 		Et2Dialog.show_prompt(
 			(button, user_password) =>