diff --git a/go.mod b/go.mod
index 328fba3..18f854f 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module git.teamworkapps.com/shortcut/docker-mailserver-passwords
 go 1.22.2
 
 require (
-	git.teamworkapps.com/shortcut/forms v0.0.0-20241008234234-c0266dc333f1
+	git.teamworkapps.com/shortcut/forms v0.0.0-20241008234648-2f8c3a703a67
 	github.com/gorilla/mux v1.8.1
 	github.com/knadh/go-pop3 v1.0.0
 )
diff --git a/go.sum b/go.sum
index 3eaaa4d..6cc9957 100644
--- a/go.sum
+++ b/go.sum
@@ -14,6 +14,8 @@ git.teamworkapps.com/shortcut/forms v0.0.0-20241008233303-19a42096fe0a h1:iVyMqu
 git.teamworkapps.com/shortcut/forms v0.0.0-20241008233303-19a42096fe0a/go.mod h1:1ElXS6rlK/NaNDQoqfCALVVKnwaSYAg2pNF8Ksvoc3Y=
 git.teamworkapps.com/shortcut/forms v0.0.0-20241008234234-c0266dc333f1 h1:79yEI04FhvgQU2yQQo0pTQKTcyq40Qs0pNaF/+dvpGI=
 git.teamworkapps.com/shortcut/forms v0.0.0-20241008234234-c0266dc333f1/go.mod h1:1ElXS6rlK/NaNDQoqfCALVVKnwaSYAg2pNF8Ksvoc3Y=
+git.teamworkapps.com/shortcut/forms v0.0.0-20241008234648-2f8c3a703a67 h1:qcTBssXGnCPgGvkPP3EgK/FvZQX0iKPDzsIsF3dliVg=
+git.teamworkapps.com/shortcut/forms v0.0.0-20241008234648-2f8c3a703a67/go.mod h1:1ElXS6rlK/NaNDQoqfCALVVKnwaSYAg2pNF8Ksvoc3Y=
 github.com/emersion/go-message v0.15.0 h1:urgKGqt2JAc9NFJcgncQcohHdiYb803YTH9OQwHBHIY=
 github.com/emersion/go-message v0.15.0/go.mod h1:wQUEfE+38+7EW8p8aZ96ptg6bAb1iwdgej19uXASlE4=
 github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594 h1:IbFBtwoTQyw0fIM5xv1HF+Y+3ZijDR839WMulgxCcUY=
diff --git a/test.html b/test.html
index 7784d13..b01d0d9 100644
--- a/test.html
+++ b/test.html
@@ -9,15 +9,15 @@
 <div class=' py-2 text-indigo-300 md:px-10 lg:col-start-2 lg:row-start-1 lg:mx-auto lg:w-full lg:max-w-lg lg:bg-transparent lg:px-0 '><label for='theemail'class='block text-sm font-medium text-gray-700'>Email Address</label><input type='text'  autocomplete='one-time-code'  name='theemail' class=' w-full mr-12 pr-12  rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm' value=''></div>
 <div class='text-red-800 font-bold' for='theemail' ><span class='error'>Must be a valid email address</span></div>
 <!-- element order 2  forms.element{Name:"theoldpassword", Label:"Old Password", LabelClasses:"", InputClasses:"", Type:"password", Hint:"", Required:false, Classes:"", Validator:"", vreg:(*regexp.Regexp)(nil), valid:false, FailMessage:"Passsword Incorrect", Value:"", Autocomplete:"one-time-code", Order:2, OnClick:"", Choices:[]forms.choice(nil), TogglePassword:false}-->
-<div class='relative  py-2 text-indigo-300 md:px-10 lg:col-start-2 lg:row-start-1 lg:mx-auto lg:w-full lg:max-w-lg lg:bg-transparent lg:px-0 '><label for='theoldpassword' class='block text-sm font-medium text-gray-700'>Old Password</label><input id='input-one-time-code' autocomplete='theoldpassword' type='password' name='theoldpassword' class=' w-full mr-12 pr-12  rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm' value=''>
+<div class='relative  py-2 text-indigo-300 md:px-10 lg:col-start-2 lg:row-start-1 lg:mx-auto lg:w-full lg:max-w-lg lg:bg-transparent lg:px-0 '><label for='theoldpassword' class='block text-sm font-medium text-gray-700'>Old Password</label><input id='input-theoldpassword' autocomplete='one-time-code' type='password' name='theoldpassword' class=' w-full mr-12 pr-12  rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm' value=''>
 </div>
 <div class='text-red-800 font-bold' for='theoldpassword' ><span class='error'>Passsword Incorrect</span></div>
 <!-- element order 3  forms.element{Name:"newpassword", Label:"New Password", LabelClasses:"", InputClasses:"", Type:"password", Hint:"", Required:false, Classes:"", Validator:"minlength=8;haslowercase;hasuppercase;hasdigit", vreg:(*regexp.Regexp)(nil), valid:false, FailMessage:"Password must be at least 8 characters long and contain at least one uppercase letter, one lowercase letter and one digit", Value:"", Autocomplete:"one-time-code", Order:3, OnClick:"", Choices:[]forms.choice(nil), TogglePassword:false}-->
-<div class='relative  py-2 text-indigo-300 md:px-10 lg:col-start-2 lg:row-start-1 lg:mx-auto lg:w-full lg:max-w-lg lg:bg-transparent lg:px-0 '><label for='newpassword' class='block text-sm font-medium text-gray-700'>New Password</label><input id='input-one-time-code' autocomplete='newpassword' type='password' name='newpassword' class=' w-full mr-12 pr-12  rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm' value=''>
+<div class='relative  py-2 text-indigo-300 md:px-10 lg:col-start-2 lg:row-start-1 lg:mx-auto lg:w-full lg:max-w-lg lg:bg-transparent lg:px-0 '><label for='newpassword' class='block text-sm font-medium text-gray-700'>New Password</label><input id='input-newpassword' autocomplete='one-time-code' type='password' name='newpassword' class=' w-full mr-12 pr-12  rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm' value=''>
 </div>
 <div class='text-red-800 font-bold' for='newpassword' ><span class='error'>Password must be at least 8 characters long and contain at least one uppercase letter, one lowercase letter and one digit</span></div>
 <!-- element order 4  forms.element{Name:"confirmpassword", Label:"Confirm Password", LabelClasses:"", InputClasses:"", Type:"password", Hint:"", Required:false, Classes:"", Validator:"mustmatch=newpassword", vreg:(*regexp.Regexp)(nil), valid:false, FailMessage:"Passwords do not match", Value:"", Autocomplete:"one-time-code", Order:4, OnClick:"", Choices:[]forms.choice(nil), TogglePassword:false}-->
-<div class='relative  py-2 text-indigo-300 md:px-10 lg:col-start-2 lg:row-start-1 lg:mx-auto lg:w-full lg:max-w-lg lg:bg-transparent lg:px-0 '><label for='confirmpassword' class='block text-sm font-medium text-gray-700'>Confirm Password</label><input id='input-one-time-code' autocomplete='confirmpassword' type='password' name='confirmpassword' class=' w-full mr-12 pr-12  rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm' value=''>
+<div class='relative  py-2 text-indigo-300 md:px-10 lg:col-start-2 lg:row-start-1 lg:mx-auto lg:w-full lg:max-w-lg lg:bg-transparent lg:px-0 '><label for='confirmpassword' class='block text-sm font-medium text-gray-700'>Confirm Password</label><input id='input-confirmpassword' autocomplete='one-time-code' type='password' name='confirmpassword' class=' w-full mr-12 pr-12  rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm' value=''>
 </div>
 <div class='text-red-800 font-bold' for='confirmpassword' ><span class='error'>Passwords do not match</span></div>
 <!-- element order 5  forms.element{Name:"", Label:"Change Password", LabelClasses:"", InputClasses:"flex w-full justify-center rounded-md bg-indigo-600 px-3 py-1.5 text-sm font-semibold leading-6 text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600", Type:"submit", Hint:"", Required:false, Classes:"", Validator:"", vreg:(*regexp.Regexp)(nil), valid:false, FailMessage:"", Value:"", Autocomplete:"", Order:5, OnClick:"", Choices:[]forms.choice(nil), TogglePassword:false}-->