diff --git a/drill-yarn/src/main/resources/drill-am/login.ftl b/drill-yarn/src/main/resources/drill-am/login.ftl
index e7fdc48..e7b16c2 100644
--- a/drill-yarn/src/main/resources/drill-am/login.ftl
+++ b/drill-yarn/src/main/resources/drill-am/login.ftl
@@ -33,7 +33,7 @@
           </div>
           </#if>
           <p><input type="text" size="30" name="j_username" placeholder="Username"></p>
-          <p><input type="password" size="30" name="j_password" placeholder="Password"></p>
+          <p><input type="password" size="30" name="j_password" placeholder="Password" autocomplete="off"></p>
           <p><button type="submit" class="btn btn-primary">Log In</button></p>
         </div>
       </fieldset>
diff --git a/exec/java-exec/src/main/resources/rest/login.ftl b/exec/java-exec/src/main/resources/rest/login.ftl
index 733b5e8..dbf1d25 100644
--- a/exec/java-exec/src/main/resources/rest/login.ftl
+++ b/exec/java-exec/src/main/resources/rest/login.ftl
@@ -32,7 +32,7 @@
           </#if>
           <h4>Log In to Drill Web Console</h4></br>
           <p><input type="text" size="30" name="j_username" placeholder="Username" autofocus></p>
-          <p><input type="password" size="30" name="j_password" placeholder="Password"></p>
+          <p><input type="password" size="30" name="j_password" placeholder="Password" autocomplete="off"></p>
           <p><button type="submit" class="btn btn-light">Log In</button> </p>
         </div>
       </fieldset>