diff --git a/frontend/static/js/index.js b/frontend/static/js/index.js
index fc4d560..537d1e7 100644
--- a/frontend/static/js/index.js
+++ b/frontend/static/js/index.js
@@ -36,11 +36,12 @@ const getParams = match => {
 };
 
 const navigateTo = async (uri) => {
-    if (await router(uri) !== 0)
-		return;
 
 	history.pushState(null, null, uri);
 
+    if (await router(uri) !== 0)
+		return;
+
 	let link = document.querySelector('a[href=\'' + location.pathname + '\']');
 	if (link) {
 		document.querySelector('[data-link].active')?.classList.remove('active');
diff --git a/frontend/static/js/views/accounts/AuthenticationView.js b/frontend/static/js/views/accounts/AuthenticationView.js
index 2053eb4..d91ded5 100644
--- a/frontend/static/js/views/accounts/AuthenticationView.js
+++ b/frontend/static/js/views/accounts/AuthenticationView.js
@@ -107,7 +107,7 @@ export default class extends AbstractNonAuthenticatedView
 		let toggle_register_login_text = this.current_mode === "register" ? "registerLogin" : "loginRegister";
 		toggle_register_login.innerText = lang.get(toggle_register_login_text, "ERROR LANG");
 
-		let button_text = this.current_mode === "login" ? "loginFormButton" : "registerFormButton";
+		let button_text = this.current_mode === "register" ? "registerFormButton" : "loginFormButton";
 		button.innerText = lang.get(button_text, "ERROR LANG");
 	}