diff --git a/rd_ui/app/login.html b/rd_ui/app/login.html
index 712435b30..9f6505d43 100644
--- a/rd_ui/app/login.html
+++ b/rd_ui/app/login.html
@@ -44,7 +44,7 @@
   <form role="form" method="post" name="login">
     <div class="form-group">
       <label for="inputEmail">Email</label>
-      <input type="text" class="form-control" id="inputEmail" name="email" value="{{email}}">
+      <input type="email" class="form-control" id="inputEmail" name="email" value="{{email}}">
     </div>
     <div class="form-group">
       <label for="inputPassword">Password</label>
diff --git a/redash/templates/forgot.html b/redash/templates/forgot.html
index 3fd87e72c..e6763dea4 100644
--- a/redash/templates/forgot.html
+++ b/redash/templates/forgot.html
@@ -13,7 +13,7 @@
 <form role="form" method="post">
     <div class="form-group ">
         <label for="email">Enter the email address you used for this account:</label>
-        <input type="text" class="form-control" name="email" value="{{email}}">
+        <input type="email" class="form-control" name="email" value="{{email}}">
     </div>
     <button type="submit" class="btn btn-primary">Reset my password</button>
 </form>