diff --git a/public/static/js/login.js b/public/static/js/login.js
index 22f306c..0044488 100644
--- a/public/static/js/login.js
+++ b/public/static/js/login.js
@@ -29,8 +29,6 @@
                 loginFormError.style.display = 'block';
                 loginFormError.innerHTML = errorText;
 
-                form.elements.email.select();
-
                 return;
             }
 
diff --git a/public/static/js/profile.js b/public/static/js/profile.js
index 744f99b..aff3137 100644
--- a/public/static/js/profile.js
+++ b/public/static/js/profile.js
@@ -37,15 +37,12 @@
                 profileFormError.style.display = 'block';
                 profileFormError.innerHTML = errorText;
 
-                form.elements.password_new.select();
-
                 return;
             }
 
             document.getElementById('profileFormError').style.display = 'none';
             form.reset();
             form.elements.save.disabled = true;
-            form.elements.password_new.focus();
         }, formData);
     };
 })();
diff --git a/public/static/js/signup.js b/public/static/js/signup.js
index 91836f6..d4674f2 100644
--- a/public/static/js/signup.js
+++ b/public/static/js/signup.js
@@ -35,14 +35,11 @@
                 signupFormError.style.display = 'block';
                 signupFormError.innerHTML = errorText;
 
-                form.elements.email.select();
-
                 return;
             }
 
             document.getElementById('signupFormError').style.display = 'none';
             form.reset();
-            form.elements.email.focus();
 
             MapGuesser.showModalWithContent('Sign up successful', 'Sign up was successful. Please check your email and click on the activation link to activate your account!');
         }, formData);
diff --git a/views/profile.php b/views/profile.php
index 7154c8c..24b6e43 100644
--- a/views/profile.php
+++ b/views/profile.php
@@ -9,12 +9,12 @@ $jsFiles = [
     <h2>Profile</h2>
     <div class="box">
         <form id="profileForm" action="/profile" method="post">
+            <input class="big fullWidth" type="password" name="password" placeholder="Current password" autofocus>
+            <hr>
             <?php /* TODO: disabled for the time being, email modification should be implemented */ ?>
             <input class="big fullWidth" type="email" name="email" placeholder="Email address" value="<?= $user['email'] ?>" disabled>
-            <input class="big fullWidth marginTop" type="password" name="password_new" placeholder="New password" minlength="6" autofocus>
+            <input class="big fullWidth marginTop" type="password" name="password_new" placeholder="New password" minlength="6">
             <input class="big fullWidth marginTop" type="password" name="password_new_confirm" placeholder="New password confirmation" minlength="6">
-            <hr>
-            <input class="big fullWidth" type="password" name="password" placeholder="Current password">
             <p id="profileFormError" class="formError justify marginTop"></p>
             <div class="right marginTop">
                 <button type="submit" name="save" disabled>Save</button>