diff --git a/template/components/form_button.go b/template/components/form_button.go
index 658306e..4b451bf 100644
--- a/template/components/form_button.go
+++ b/template/components/form_button.go
@@ -1,6 +1,8 @@
 package components
 
 type FormButton struct {
+	ID         string
+	Value      string
 	Text       string
 	Icon       string
 	IsSubmit   bool
diff --git a/template/components/form_button.html b/template/components/form_button.html
index 7594613..b58a9ed 100644
--- a/template/components/form_button.html
+++ b/template/components/form_button.html
@@ -1,5 +1,5 @@
 {{define "form_button"}}
-    <button class="btn btn-{{.TypeClass}}" {{if eq .IsSubmit true}}type="submit"{{else}}type="button"{{end}} {{if .IsDisabled}}disabled{{end}}>
+    <button {{if .ID }}id="{{.ID}}" name="{{.ID}}"{{end}} {{if .Value }}value="{{.Value}}" name="{{.ID}}"{{end}} class="btn btn-{{.TypeClass}}" {{if eq .IsSubmit true}}type="submit"{{else}}type="button"{{end}} {{if .IsDisabled}}disabled{{end}}>
         {{.Text}}
     </button>
         <!-- tailwind heroicons -->
diff --git a/template/components/form_input.go b/template/components/form_input.go
index e27910f..d1264ec 100644
--- a/template/components/form_input.go
+++ b/template/components/form_input.go
@@ -1,13 +1,14 @@
 package components
 
 type FormInput struct {
-	ID          string
-	Label       string
-	Type        string
-	Placeholder string
-	Value       string
-	Hint        string
-	Error       string
-	IsDisabled  bool
-	IsRequired  bool
+	ID           string
+	Label        string
+	Type         string
+	Placeholder  string
+	Value        string
+	Hint         string
+	Error        string
+	IsDisabled   bool
+	Autocomplete bool
+	IsRequired   bool
 }
diff --git a/template/components/form_input.html b/template/components/form_input.html
index 8159896..6103b76 100644
--- a/template/components/form_input.html
+++ b/template/components/form_input.html
@@ -8,6 +8,9 @@
         {{if eq .IsRequired true}}
             required
         {{end}}
+        {{if eq .Autocomplete false}}
+            autocomplete="off"
+        {{end}}        
         {{if ne .Value ""}}
             value="{{.Value}}"
         {{end}}