diff --git a/src/amber_cli/commands/generate.cr b/src/amber_cli/commands/generate.cr
index 10de627..13d5caf 100644
--- a/src/amber_cli/commands/generate.cr
+++ b/src/amber_cli/commands/generate.cr
@@ -1337,11 +1337,11 @@ VIEW
 h1 Login
 == form(action: "/session", method: "post") do
   .form-group
-    label Email
-    input type="email" name="email" required=true
+    label for="email" Email
+    input id="email" type="email" name="email" required="true"
   .form-group
-    label Password
-    input type="password" name="password" required=true
+    label for="password" Password
+    input id="password" type="password" name="password" required="true"
   button type="submit" Login
 VIEW
 
@@ -1349,14 +1349,14 @@ VIEW
 h1 Create Account
 == form(action: "/register", method: "post") do
   .form-group
-    label Email
-    input type="email" name="email" required=true
+    label for="email" Email
+    input id="email" type="email" name="email" required="true"
   .form-group
-    label Password
-    input type="password" name="password" required=true
+    label for="password" Password
+    input id="password" type="password" name="password" required="true"
   .form-group
-    label Confirm Password
-    input type="password" name="password_confirmation" required=true
+    label for="password_confirmation" Confirm Password
+    input id="password_confirmation" type="password" name="password_confirmation" required="true"
   button type="submit" Create Account
 VIEW
       end
diff --git a/src/amber_cli/templates/auth/src/views/session/new.ecr.ecr b/src/amber_cli/templates/auth/src/views/session/new.ecr.ecr
index adbe0ff..8ef9f63 100644
--- a/src/amber_cli/templates/auth/src/views/session/new.ecr.ecr
+++ b/src/amber_cli/templates/auth/src/views/session/new.ecr.ecr
@@ -11,10 +11,12 @@
 <form action="/session" method="post">
   <%="<"%>%= csrf_tag %>
   <div class="form-group">
-    <input class="form-control" type="email" name="email" placeholder="Email"/>
+    <label for="email">Email</label>
+    <input class="form-control" type="email" name="email" id="email" placeholder="Email" required />
   </div>
   <div class="form-group">
-    <input class="form-control" type="password" name="password" placeholder="Password"/>
+    <label for="password">Password</label>
+    <input class="form-control" type="password" name="password" id="password" placeholder="Password" required />
   </div>
   <button class="btn btn-success btn-sm" type="submit">Sign In</button>
 </form>
diff --git a/src/amber_cli/templates/auth/src/views/session/new.slang.ecr b/src/amber_cli/templates/auth/src/views/session/new.slang.ecr
index 1651627..9912908 100644
--- a/src/amber_cli/templates/auth/src/views/session/new.slang.ecr
+++ b/src/amber_cli/templates/auth/src/views/session/new.slang.ecr
@@ -8,9 +8,11 @@ h1 Sign In
 form action="/session" method="post"
   == csrf_tag
   .form-group
-    input.form-control type="email" name="email" placeholder="Email"
+    label for="email" Email
+    input.form-control type="email" name="email" id="email" placeholder="Email" required="true"
   .form-group
-    input.form-control type="password" name="password" placeholder="Password"
+    label for="password" Password
+    input.form-control type="password" name="password" id="password" placeholder="Password" required="true"
   button.btn.btn-success.btn-sm type="submit" Sign In
 <hr/>
 == link_to("Don't have an account yet?", "/signup")
diff --git a/src/amber_cli/templates/auth/src/views/{{name}}/edit.ecr.ecr b/src/amber_cli/templates/auth/src/views/{{name}}/edit.ecr.ecr
index 1bee45d..7377432 100644
--- a/src/amber_cli/templates/auth/src/views/{{name}}/edit.ecr.ecr
+++ b/src/amber_cli/templates/auth/src/views/{{name}}/edit.ecr.ecr
@@ -13,7 +13,8 @@
   <input type="hidden" name="_method" value="patch" />
 
   <div class="form-group">
-    <input class="form-control" type="email" name="email" placeholder="Email" value="<%="<"%>%= <%= @name %>.email %>" />
+    <label for="email">Email</label>
+    <input class="form-control" type="email" name="email" id="email" placeholder="Email" value="<%="<"%>%= <%= @name %>.email %>" />
   </div>
   <%="<"%>%= submit("Update", class: "btn btn-success btn-sm") %>
   <%="<"%>%= link_to("Profile", "/profile", class: "btn btn-light btn-sm") %>
diff --git a/src/amber_cli/templates/auth/src/views/{{name}}/edit.slang.ecr b/src/amber_cli/templates/auth/src/views/{{name}}/edit.slang.ecr
index 5e384ce..4a49200 100644
--- a/src/amber_cli/templates/auth/src/views/{{name}}/edit.slang.ecr
+++ b/src/amber_cli/templates/auth/src/views/{{name}}/edit.slang.ecr
@@ -8,6 +8,7 @@ h1 Edit Profile
 == form(action: "/profile", method: :patch) do
   == csrf_tag
   .form-group
-    input.form-control type="email" name="email" placeholder="Email" value="#{<%= @name %>.email}"
+    label for="email" Email
+    input.form-control type="email" name="email" id="email" placeholder="Email" value="#{<%= @name %>.email}"
   == submit("Update", class: "btn btn-success btn-sm")
   == link_to("Profile", "/profile", class: "btn btn-light btn-sm")
diff --git a/src/amber_cli/templates/auth/src/views/{{name}}/new.ecr.ecr b/src/amber_cli/templates/auth/src/views/{{name}}/new.ecr.ecr
index 19bc264..d842088 100644
--- a/src/amber_cli/templates/auth/src/views/{{name}}/new.ecr.ecr
+++ b/src/amber_cli/templates/auth/src/views/{{name}}/new.ecr.ecr
@@ -13,10 +13,12 @@
 <form action="/registration" method="post">
   <%="<"%>%= csrf_tag %>
   <div class="form-group">
-    <input class="form-control" type="email" name="email" placeholder="Email"/>
+    <label for="email">Email</label>
+    <input class="form-control" type="email" name="email" id="email" placeholder="Email" required />
   </div>
   <div class="form-group">
-    <input class="form-control" type="password" name="password" placeholder="Password"/>
+    <label for="password">Password</label>
+    <input class="form-control" type="password" name="password" id="password" placeholder="Password" required />
   </div>
   <button class="btn btn-success btn-sm" type="submit">Register</button>
 </form>
diff --git a/src/amber_cli/templates/auth/src/views/{{name}}/new.slang.ecr b/src/amber_cli/templates/auth/src/views/{{name}}/new.slang.ecr
index 8d6a1bd..578ca7e 100644
--- a/src/amber_cli/templates/auth/src/views/{{name}}/new.slang.ecr
+++ b/src/amber_cli/templates/auth/src/views/{{name}}/new.slang.ecr
@@ -9,9 +9,11 @@ h1 Sign Up
 form action="/registration" method="post"
   == csrf_tag
   .form-group
-    input.form-control type="email" name="email" placeholder="Email"
+    label for="email" Email
+    input.form-control type="email" name="email" id="email" placeholder="Email" required="true"
   .form-group
-    input.form-control type="password" name="password" placeholder="Password"
+    label for="password" Password
+    input.form-control type="password" name="password" id="password" placeholder="Password" required="true"
   button.btn.btn-success.btn-sm type="submit"
     | Register
 <hr/>