diff --git a/puppet/src/contentscript.js b/puppet/src/contentscript.js
index 15a656b..5598307 100644
--- a/puppet/src/contentscript.js
+++ b/puppet/src/contentscript.js
@@ -1705,7 +1705,7 @@ class MautrixController {
 		this.emailAppearObserver = new MutationObserver(changes => {
 			for (const change of changes) {
 				for (const node of change.addedNodes) {
-					const emailArea = node.querySelector("#login_email_area")
+					const emailArea = node.querySelector("[class*='login_form_area']")
 					if (emailArea && !emailArea.classList.contains("MdNonDisp")) {
 						window.__mautrixSendEmailCredentials()
 						return
diff --git a/puppet/src/puppet.js b/puppet/src/puppet.js
index 6d68684..1a5ca79 100644
--- a/puppet/src/puppet.js
+++ b/puppet/src/puppet.js
@@ -210,7 +210,7 @@ export default class MessagesPuppeteer {
 		this.loginRunning = true
 		await this.page.bringToFront()
 
-		const loginContentArea = await this.page.waitForSelector("#login_content")
+		const loginContentArea = await this.page.waitForSelector("[class*='page_login']")
 
 		switch (login_type) {
 		case "qr": {
@@ -236,10 +236,7 @@ export default class MessagesPuppeteer {
 				return
 			}
 
-			const emailButton = await this.page.waitForSelector("#login_email_btn")
-			await emailButton.click()
-
-			await this.page.waitForSelector("#login_email_area", {visible: true})
+			await this.page.waitForSelector("[class*='login_form_area']", {visible: true})
 			this.login_email = login_data["email"]
 			this.login_password = login_data["password"]
 			await this._sendEmailCredentials()
@@ -1263,9 +1260,9 @@ export default class MessagesPuppeteer {
 
 	async _sendEmailCredentials() {
 		this.log("Inputting login credentials")
-		await this._enterText(await this.page.$("#line_login_email"), this.login_email)
-		await this._enterText(await this.page.$("#line_login_pwd"), this.login_password)
-		await this.page.click("button#login_btn")
+		await this._enterText(await this.page.$("input[name='email']"), this.login_email)
+		await this._enterText(await this.page.$("input[name='password']"), this.login_password)
+		await this.page.click("button[class*='button_login']")
 	}
 
 	_receiveQRChange(url) {