diff --git a/templates/login.html.ep b/templates/login.html.ep
index 23d3259..cf4364f 100644
--- a/templates/login.html.ep
+++ b/templates/login.html.ep
@@ -75,12 +75,12 @@
 		<div class="row">
 			<div class="input-field col s12">
 				<i class="material-icons prefix">account_circle</i>
-				%= text_field 'user', id => 'user', class => 'validate', required => undef, maxlength => 60
+				%= text_field 'user', id => 'user', class => 'validate', required => undef, maxlength => 60, autocomplete => 'username'
 				<label for="user">Account</label>
 			</div>
 			<div class="input-field col s12">
 				<i class="material-icons prefix">lock</i>
-				%= password_field 'password', id => 'password', class => 'validate', required => undef
+				%= password_field 'password', id => 'password', class => 'validate', required => undef, autocomplete => 'current-password'
 				<label for="password">Passwort</label>
 			</div>
 		</div>
diff --git a/templates/register.html.ep b/templates/register.html.ep
index 6a4a72d..44a7615 100644
--- a/templates/register.html.ep
+++ b/templates/register.html.ep
@@ -64,7 +64,7 @@
 		<div class="row">
 			<div class="input-field col l6 m12 s12">
 				<i class="material-icons prefix">account_circle</i>
-				%= text_field 'user', id => 'account', class => 'validate', required => undef, pattern => '[0-9a-zA-Z_-]+', maxlength => 60
+				%= text_field 'user', id => 'account', class => 'validate', required => undef, pattern => '[0-9a-zA-Z_-]+', maxlength => 60, autocomplete => 'username'
 				<label for="account">Name</label>
 			</div>
 			<div class="input-field col l6 m12 s12">
@@ -74,12 +74,12 @@
 			</div>
 			<div class="input-field col l6 m12 s12">
 				<i class="material-icons prefix">lock</i>
-				%= password_field 'password', id => 'password', class => 'validate', required => undef, minlength => 8
+				%= password_field 'password', id => 'password', class => 'validate', required => undef, minlength => 8, autocomplete => 'new-password'
 				<label for="password">Passwort</label>
 			</div>
 			<div class="input-field col l6 m12 s12">
 				<i class="material-icons prefix">lock</i>
-				%= password_field 'password2', id => 'password2', class => 'validate', required => undef, minlength => 8
+				%= password_field 'password2', id => 'password2', class => 'validate', required => undef, minlength => 8, autocomplete => 'new-password'
 				<label for="password2">Passwort wiederholen</label>
 			</div>
 		</div>