diff --git a/main.go b/main.go
index 90575a4..a5f9942 100644
--- a/main.go
+++ b/main.go
@@ -52,6 +52,7 @@ func main() {
 	e.Label = "Old Password"
 	e.Type = "password"
 	e.Validator = ""
+	e.Autocomplete = "new-password"
 	e.FailMessage = "Passsword Incorrect"
 	e.Name = "oldpassword"
 	f.Add(e)
@@ -62,6 +63,7 @@ func main() {
 	e.FailMessage = "Password must be at least 8 characters long and contain at least one uppercase letter, one lowercase letter and one digit"
 	e.Validator = "minlength=8;haslowercase;hasuppercase;hasdigit"
 	e.Name = "newpassword"
+	e.Autocomplete = "new-password"
 	f.Add(e)
 
 	e = forms.NewElement()
@@ -70,6 +72,7 @@ func main() {
 	e.FailMessage = "Passwords do not match"
 	e.Validator = "mustmatch=newpassword"
 	e.Name = "confirmpassword"
+	e.Autocomplete = "new-password"
 	f.Add(e)
 
 	e = forms.NewElement()