diff --git a/views/account/account.php b/views/account/account.php
index 128e14e..c5cb798 100644
--- a/views/account/account.php
+++ b/views/account/account.php
@@ -9,12 +9,12 @@
             <?php if ($user['password'] !== null && $user['google_sub'] !== null): ?>
                 <p class="justify small">Please confirm your identity with your password or with Google to modify your account.</p>
                 <div class="inputWithButton">
-                    <input type="password" class="text" name="password" placeholder="Current password" required minlength="6" autofocus><!--
+                    <input type="password" class="text" name="password" placeholder="Current password" autocomplete="current-password" required minlength="6" autofocus><!--
                  --><button id="authenticateWithGoogleButton" class="yellow" type="button">Google</button>
                 </div>
             <?php elseif ($user['password'] !== null): ?>
                 <p class="justify small">Please confirm your identity with your password to modify your account.</p>
-                <input type="password" class="text big fullWidth" name="password" placeholder="Current password" required minlength="6" autofocus>
+                <input type="password" class="text big fullWidth" name="password" placeholder="Current password" autocomplete="current-password" required minlength="6" autofocus>
             <?php elseif ($user['google_sub'] !== null): ?>
                 <p class="justify small">Please confirm your identity with Google to modify your account.</p>
                 <div class="inputWithButton">
@@ -23,10 +23,10 @@
                 </div>
             <?php endif; ?>
             <hr>
-            <input type="email" class="text big fullWidth" name="email" placeholder="Email address" value="<?= $user['email'] ?>">
+            <input type="email" class="text big fullWidth" name="email" placeholder="Email address" autocomplete="username" value="<?= $user['email'] ?>">
             <input type="text" class="text big fullWidth marginTop" name="username" placeholder="Username" value="<?= $user['username'] ?>">
-            <input type="password" class="text big fullWidth marginTop" name="password_new" placeholder="New password" minlength="6">
-            <input type="password" class="text big fullWidth marginTop" name="password_new_confirm" placeholder="New password confirmation" minlength="6">
+            <input type="password" class="text big fullWidth marginTop" name="password_new" placeholder="New password" autocomplete="new-password" minlength="6">
+            <input type="password" class="text big fullWidth marginTop" name="password_new_confirm" placeholder="New password confirmation" autocomplete="new-password" minlength="6">
             <hr>
             <input type="text" class="text big fullWidth marginTop" name="full_name" placeholder="Full name" value="<?= $user['full_name'] ?>" disabled>
             <input type="text" class="text big fullWidth marginTop" name="nickname" placeholder="Nickname" value="<?= $user['nickname'] ?>">
diff --git a/views/login/login.php b/views/login/login.php
index 1d5fe4d..43ebd0e 100644
--- a/views/login/login.php
+++ b/views/login/login.php
@@ -4,8 +4,8 @@
     <h2>Login</h2>
     <div class="box compactBox">
         <form id="loginForm" action="<?= Container::$routeCollection->getRoute('login-action')->generateLink() ?>" method="post" data-redirect-on-success="<?= $redirectUrl ?>">
-            <input type="text" class="text big fullWidth" name="email" placeholder="Email address / Username" required autofocus>
-            <input type="password"  class="text big fullWidth marginTop" name="password" placeholder="Password" required minlength="6">
+            <input type="text" class="text big fullWidth" name="email" placeholder="Email address / Username" autocomplete="username" required autofocus>
+            <input type="password" class="text big fullWidth marginTop" name="password" placeholder="Password" autocomplete="current-password" required minlength="6">
             <p id="loginFormError" class="formError justify marginTop"></p>
             <div class="right marginTop">
                 <button type="submit">Login</button>
diff --git a/views/login/reset_password.php b/views/login/reset_password.php
index 69d3875..eca487a 100644
--- a/views/login/reset_password.php
+++ b/views/login/reset_password.php
@@ -5,9 +5,9 @@
     <div class="box compactBox">
         <?php if ($success) : ?>
             <form id="resetPasswordForm" action="<?= Container::$routeCollection->getRoute('password.reset-action')->generateLink(['token' => $token]) ?>"" method="post" data-redirect-on-success="<?= $redirectUrl ?>">
-                <input type="email" class="text big fullWidth" name="email" placeholder="Email address" value="<?= $email ?>" disabled>
-                <input type="password" class="text big fullWidth marginTop" name="password" placeholder="Password" required minlength="6" autofocus>
-                <input type="password" class="text big fullWidth marginTop" name="password_confirm" placeholder="Password confirmation" required minlength="6">
+                <input type="text" class="text big fullWidth" name="email" placeholder="Email address / Username" autocomplete="username" value="<?= $email ?>" disabled>
+                <input type="password" class="text big fullWidth marginTop" name="password" placeholder="Password" autocomplete="new-password" required minlength="6" autofocus>
+                <input type="password" class="text big fullWidth marginTop" name="password_confirm" placeholder="Password confirmation" autocomplete="new-password" required minlength="6">
                 <p id="resetPasswordFormError" class="formError justify marginTop"></p>
                 <div class="right">
                     <button class="marginTop" type="submit">Reset password</button>