diff --git a/files/assets/js/ban_modal.js b/files/assets/js/ban_modal.js
index ec01732d2..df98e695e 100644
--- a/files/assets/js/ban_modal.js
+++ b/files/assets/js/ban_modal.js
@@ -3,7 +3,7 @@ function banModal(link, name, fullname, cls) {
 	document.getElementById("ban-modal-link").value = link;
 	document.getElementById("banUserButton").innerHTML = `Ban @${name}`;
 
-	document.getElementById("banUserButton").onclick = function() {
+	document.getElementById("banUserButton").addEventListener('click', function() {
 		let form = new FormData(document.getElementById("banModalForm"));
 		const xhr = createXhrWithFormKey(`/ban_user/${fullname}?form`, "POST", form);
 		xhr[0].onload = function() {
@@ -19,7 +19,7 @@ function banModal(link, name, fullname, cls) {
 		};
 
 		xhr[0].send(xhr[1]);
-	}
+	})
 }
 
 function chudModal(link, name, fullname, cls) {
@@ -27,7 +27,7 @@ function chudModal(link, name, fullname, cls) {
 	document.getElementById("chud-modal-link").value = link;
 	document.getElementById("chudUserButton").innerHTML = `Chud @${name}`;
 
-	document.getElementById("chudUserButton").onclick = function() {
+	document.getElementById("chudUserButton").addEventListener('click', function() {
 		let form = new FormData(document.getElementById("chudModalForm"));
 		const xhr = createXhrWithFormKey(`/agendaposter/${fullname}?form`, "POST", form);
 		xhr[0].onload = function() {
@@ -43,5 +43,5 @@ function chudModal(link, name, fullname, cls) {
 		};
 
 		xhr[0].send(xhr[1]);
-	}
+	})
 }
diff --git a/files/assets/js/emoji_modal.js b/files/assets/js/emoji_modal.js
index 4c6ac8795..61c694beb 100644
--- a/files/assets/js/emoji_modal.js
+++ b/files/assets/js/emoji_modal.js
@@ -244,7 +244,7 @@ emojiRequest.onload = async (e) => {
 		classSelectorLinkDOM.dataset.bsToggle = "tab";
 		classSelectorLinkDOM.dataset.className = className;
 		classSelectorLinkDOM.innerText = className;
-		classSelectorLinkDOM.onclick = switchEmojiTab;
+		classSelectorLinkDOM.addEventListener('click', switchEmojiTab);
 
 		classSelectorDOM.appendChild(classSelectorLinkDOM);
 		classesSelectorDOM.appendChild(classSelectorDOM);
diff --git a/files/assets/js/gif_modal.js b/files/assets/js/gif_modal.js
index 50613ad92..5114db062 100644
--- a/files/assets/js/gif_modal.js
+++ b/files/assets/js/gif_modal.js
@@ -110,7 +110,7 @@ async function getGifs(form) {
 	}
 }
 
-document.getElementById('gifs-back-btn').onclick = getGifs;
+document.getElementById('gifs-back-btn').addEventListener('click', getGifs);
 
 async function searchGifs(searchTerm) {
 
@@ -139,4 +139,4 @@ async function searchGifs(searchTerm) {
 	}
 }
 
-gifSearchBar.onchange = () => {searchGifs(gifSearchBar.value)};
+gifSearchBar.addEventListener('change', () => {searchGifs(gifSearchBar.value)});
diff --git a/files/assets/js/settings_security.js b/files/assets/js/settings_security.js
index b1ac74589..7a32a3e6a 100644
--- a/files/assets/js/settings_security.js
+++ b/files/assets/js/settings_security.js
@@ -42,4 +42,4 @@ function unblock_user(t, url) {
 	);
 }
 
-document.getElementById('2faToggle').onchange = () => {twoStepModal.show()}
+document.getElementById('2faToggle').addEventListener('change', () => {twoStepModal.show()})
diff --git a/files/assets/js/signup.js b/files/assets/js/signup.js
index 44d661aee..bb10053af 100644
--- a/files/assets/js/signup.js
+++ b/files/assets/js/signup.js
@@ -41,6 +41,6 @@ document.getElementById('username-register').addEventListener('input', function
 });
 
 
-document.getElementById('email-register').onfocus = (e) => {
+document.getElementById('email-register').addEventListener('focus', (e) => {
 	if (e.target.hasAttribute('readonly')) {e.target.removeAttribute('readonly');e.target.blur();e.target.focus()}
-};
+});