diff --git a/src/sunstone/public/app/tabs/hosts-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/hosts-tab/form-panels/create/wizard.hbs
index 0f91a64e87..07bc557e6e 100644
--- a/src/sunstone/public/app/tabs/hosts-tab/form-panels/create/wizard.hbs
+++ b/src/sunstone/public/app/tabs/hosts-tab/form-panels/create/wizard.hbs
@@ -186,11 +186,11 @@
         </div>
         <div class="large-4 medium-6 columns">
           <label for="vcenter_user">{{tr "User"}}</label>
-          <input type="text" name="vcenter_user" id="vcenter_user" required />
+          <input type="text" autocomplete="email" autocomplete="username" name="vcenter_user" id="vcenter_user" required />
         </div>
         <div class="large-4 medium-6 columns">
           <label for="vcenter_password">{{tr "Password"}}</label>
-          <input type="password" name="vcenter_password" id="vcenter_password" required />
+          <input type="password" autocomplete="new-password" name="vcenter_password" id="vcenter_password" required />
         </div>
       </div>
       <div style="float:left">
diff --git a/src/sunstone/public/app/tabs/settings-tab/panels/user-config/html.hbs b/src/sunstone/public/app/tabs/settings-tab/panels/user-config/html.hbs
index 90006cf326..9018128dc2 100644
--- a/src/sunstone/public/app/tabs/settings-tab/panels/user-config/html.hbs
+++ b/src/sunstone/public/app/tabs/settings-tab/panels/user-config/html.hbs
@@ -67,12 +67,12 @@
           <form id="provision_change_password_form">
             <div class="row">
               <div class="large-12 columns">
-                <input type="password" id="provision_new_password" class="provision-input" placeholder="{{tr "New Password"}}"/>
+                <input type="password" autocomplete="new-password" id="provision_new_password" class="provision-input" placeholder="{{tr "New Password"}}"/>
               </div>
             </div>
             <div class="row">
               <div class="large-12 columns">
-                <input type="password" id="provision_new_confirm_password" class="provision-input" placeholder="{{tr "Confirm Password"}}"/>
+                <input type="password" autocomplete="new-password" id="provision_new_confirm_password" class="provision-input" placeholder="{{tr "Confirm Password"}}"/>
               </div>
             </div>
             {{#if cantChangePassword}}
diff --git a/src/sunstone/public/app/tabs/support-tab/subheader.hbs b/src/sunstone/public/app/tabs/support-tab/subheader.hbs
index c80b8be212..9b78d2085b 100644
--- a/src/sunstone/public/app/tabs/support-tab/subheader.hbs
+++ b/src/sunstone/public/app/tabs/support-tab/subheader.hbs
@@ -33,11 +33,11 @@
       <form id="support_credentials_form">
         <div class="large-12 columns">
           <label for="support_email">Email</label>
-          <input id="support_email" type="text"></input>
+          <input id="support_email" autocomplete="email" type="text"></input>
         </div>
         <div class="large-12 columns">
           <label for="support_password">Password</label>
-          <input id="support_password" type="password"></input>
+          <input id="support_password"  autocomplete="current-password" type="password"></input>
         </div>
         <div class="large-12 columns">
           <button class="button right radius success submit_support_credentials_button" type="submit">Sign in</button>
diff --git a/src/sunstone/public/app/tabs/users-tab/utils/user-creation/html.hbs b/src/sunstone/public/app/tabs/users-tab/utils/user-creation/html.hbs
index 5e004f4dcf..5cdd4870b2 100644
--- a/src/sunstone/public/app/tabs/users-tab/utils/user-creation/html.hbs
+++ b/src/sunstone/public/app/tabs/users-tab/utils/user-creation/html.hbs
@@ -17,17 +17,17 @@
 <div class="row name_row">
   <div class="large-12 columns">
     <label for="username">{{tr "Username"}}</label>
-    <input required type="text" name="username" id="{{idPrefix}}_username" />
+    <input required type="text" autocomplete="username" name="username" id="{{idPrefix}}_username" />
   </div>
 </div>
 <div class="row password_row">
   <div class="large-12 columns">
     <label for="pass">{{tr "Password"}}</label>
-    <input required type="password" name="pass" id="{{idPrefix}}_pass" />
+    <input required type="password" autocomplete="new-password" name="pass" id="{{idPrefix}}_pass" />
   </div>
   <div class="large-12 columns">
     <label for="confirm_password">{{tr "Confirm Password"}}</label>
-    <input data-equalto="{{idPrefix}}_pass" type="password" name="confirm_password" id="{{idPrefix}}_confirm_password" />
+    <input data-equalto="{{idPrefix}}_pass" autocomplete="new-password" type="password" name="confirm_password" id="{{idPrefix}}_confirm_password" />
     <small class="form-error">{{tr "Passwords do not match"}}</small>
   </div>
 </div>
diff --git a/src/sunstone/views/_login_standard.erb b/src/sunstone/views/_login_standard.erb
index 7f7cd47484..c6434103bc 100644
--- a/src/sunstone/views/_login_standard.erb
+++ b/src/sunstone/views/_login_standard.erb
@@ -2,11 +2,11 @@
   <div class="content">
     <label class="text-left">
       Username
-      <input type="text" size="15" name="username" id="username" class="box"/>
+      <input autocomplete="username" type="text" size="15" name="username" id="username" class="box"/>
     </label>
     <label class="text-left">
       Password
-      <input type="password" size="15" name="password" id="password" class="box"/>
+      <input autocomplete="current-password" type="password" size="15" name="password" id="password" class="box"/>
     </label>
     <div class="row buttons small-collapse">
       <div class="columns small-6 text-left">