diff --git a/appserver/admingui/cluster/src/main/resources/cluster/clusterNew.jsf b/appserver/admingui/cluster/src/main/resources/cluster/clusterNew.jsf
index 04d9b691ae9..7a51d807cd5 100644
--- a/appserver/admingui/cluster/src/main/resources/cluster/clusterNew.jsf
+++ b/appserver/admingui/cluster/src/main/resources/cluster/clusterNew.jsf
@@ -58,7 +58,7 @@
         setPageSessionAttribute(key="jmsType" value="#{jmsTypeOptionGrp}");
     />
     </event>
-    <sun:form id="propertyForm">
+    <sun:form id="propertyForm" autoComplete="off">
 #include "/cluster/shared/handlers.inc"
 #include "/cluster/shared/jmsHandlers.inc"
 #include "/common/shared/alertMsg.inc"
diff --git a/appserver/admingui/cluster/src/main/resources/node/nodeAttr.inc b/appserver/admingui/cluster/src/main/resources/node/nodeAttr.inc
index 281aec74e01..08504d59d85 100644
--- a/appserver/admingui/cluster/src/main/resources/node/nodeAttr.inc
+++ b/appserver/admingui/cluster/src/main/resources/node/nodeAttr.inc
@@ -217,7 +217,7 @@
                 <!afterCreate
                     getClientId(component="$this{component}" clientId="#{pageSession.ps1PropId}");
                 />
-                <sun:passwordField id="NewPassword" text="#{pageSession.pswdText}" columns="$int{25}" maxLength="#{sessionScope.fieldLengths['maxLength.server.NewPassword']}"  >
+                <sun:passwordField id="NewPassword" name="password" text="#{pageSession.pswdText}" columns="$int{25}" maxLength="#{sessionScope.fieldLengths['maxLength.server.NewPassword']}"  >
                  <!afterCreate
                     getClientId(component="$this{component}" clientId="#{pageSession.ps1Id}");
                 />
@@ -264,7 +264,7 @@
                 <!afterCreate
                         getClientId(component="$this{component}" clientId="#{pageSession.setupPswdPropId}");
                 />
-                <sun:passwordField id="setupPswd" columns="$int{60}" maxLength="#{sessionScope.fieldLengths['maxLength.node.Keyfile']}" text="#{pageSession.setupPswd}" >
+                <sun:passwordField id="setupPswd" name="password" columns="$int{60}" maxLength="#{sessionScope.fieldLengths['maxLength.node.Keyfile']}" text="#{pageSession.setupPswd}" >
                 <!afterCreate
                         getClientId(component="$this{component}" clientId="#{pageSession.setupPswdId}");
                 />
@@ -339,7 +339,7 @@
                 <!afterCreate
                         getClientId(component="$this{component}" clientId="#{pageSession.winPs1PropId}");
                     />
-                <sun:passwordField id="NewPassword" text="#{pageSession.winPswdText}" columns="$int{25}" maxLength="#{sessionScope.fieldLengths['maxLength.server.NewPassword']}"  >
+                <sun:passwordField id="NewPassword" name="password" text="#{pageSession.winPswdText}" columns="$int{25}" maxLength="#{sessionScope.fieldLengths['maxLength.server.NewPassword']}"  >
                      <!afterCreate
                         getClientId(component="$this{component}" clientId="#{pageSession.winPs1Id}");
                     />
diff --git a/appserver/admingui/cluster/src/main/resources/node/nodeEdit.jsf b/appserver/admingui/cluster/src/main/resources/node/nodeEdit.jsf
index 79dad11ea71..c0398d03303 100644
--- a/appserver/admingui/cluster/src/main/resources/node/nodeEdit.jsf
+++ b/appserver/admingui/cluster/src/main/resources/node/nodeEdit.jsf
@@ -128,7 +128,7 @@
         setPageSessionAttribute(key="titleHelp" value="$resource{i18ncs.node.EditPageTitleHelp}");
         />
     </event>
-            <sun:form id="propertyForm">
+            <sun:form id="propertyForm" autoComplete="off">
 #include "/common/shared/alertMsg.inc"
 #include "/cluster/node/nodeAttr.inc"
 
diff --git a/appserver/admingui/cluster/src/main/resources/node/nodeNew.jsf b/appserver/admingui/cluster/src/main/resources/node/nodeNew.jsf
index 1c3ffb3917a..8f95071c582 100644
--- a/appserver/admingui/cluster/src/main/resources/node/nodeNew.jsf
+++ b/appserver/admingui/cluster/src/main/resources/node/nodeNew.jsf
@@ -86,7 +86,7 @@
 
     />
     </event>
-<sun:form id="propertyForm">
+<sun:form id="propertyForm" autoComplete="off">
 #include "/common/shared/alertMsg.inc"
 #include "/cluster/node/nodeAttr.inc"
 
diff --git a/appserver/admingui/common/src/main/resources/appServer/pswdAliasAttr.inc b/appserver/admingui/common/src/main/resources/appServer/pswdAliasAttr.inc
index 3ae2f7f6feb..0ab33726d00 100644
--- a/appserver/admingui/common/src/main/resources/appServer/pswdAliasAttr.inc
+++ b/appserver/admingui/common/src/main/resources/appServer/pswdAliasAttr.inc
@@ -52,14 +52,14 @@
             </sun:property>
 
             <sun:property id="newPasswordProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18nc.pswdAlias.password}"  helpText="$resource{i18nc.pswdAlias.passwordHelp}">
-            <sun:passwordField id="NewPassword"  styleClass="required" required="#{true}" columns="$int{25}" maxLength="#{sessionScope.fieldLengths['maxLength.server.NewPassword']}" text="#{pageSession.valueMap['aliaspassword']}" >
+            <sun:passwordField id="NewPassword"  name="password" styleClass="required" required="#{true}" columns="$int{25}" maxLength="#{sessionScope.fieldLengths['maxLength.server.NewPassword']}" text="#{pageSession.valueMap['aliaspassword']}" >
                  <!afterCreate
                     getClientId(component="$this{component}" clientId="#{pageSession.ps1}");
                 />
             </sun:passwordField>
             </sun:property>
             <sun:property id="confirmPasswordProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18nc.pswdAlias.confirmPassword}"  helpText="$resource{i18nc.pswdAlias.confirmPasswordHelp}">>
-                <sun:passwordField id="ConfirmPassword"  styleClass="required" required="#{true}" columns="$int{25}" maxLength="#{sessionScope.fieldLengths['maxLength.server.ConfirmNewPassword']}" text="#{pageSession.confirmPassword}"   >
+                <sun:passwordField id="ConfirmPassword"  name="password" styleClass="required" required="#{true}" columns="$int{25}" maxLength="#{sessionScope.fieldLengths['maxLength.server.ConfirmNewPassword']}" text="#{pageSession.confirmPassword}"   >
                     <!afterCreate
                         getClientId(component="$this{component}" clientId="#{pageSession.ps2}");
                     />
diff --git a/appserver/admingui/common/src/main/resources/appServer/pswdAliasEdit.jsf b/appserver/admingui/common/src/main/resources/appServer/pswdAliasEdit.jsf
index d213f4860db..6c0188c479d 100644
--- a/appserver/admingui/common/src/main/resources/appServer/pswdAliasEdit.jsf
+++ b/appserver/admingui/common/src/main/resources/appServer/pswdAliasEdit.jsf
@@ -55,7 +55,7 @@
             setPageSessionAttribute(key="edit" value="#{true}" );
         />
     </event>
-<sun:form id="propertyForm">
+<sun:form id="propertyForm" autoComplete="off">
 #include "/common/shared/alertMsg_1.inc"
     <sun:title id="propertyContentPage"  title="$resource{i18nc.pswdAliasEdit.title}"  helpText="$resource{i18nc.pswdAliasEdit.titleHelp}" >
         <!facet pageButtonsTop>
diff --git a/appserver/admingui/common/src/main/resources/appServer/pswdAliasNew.jsf b/appserver/admingui/common/src/main/resources/appServer/pswdAliasNew.jsf
index f69755bc05d..75c6f292cb9 100644
--- a/appserver/admingui/common/src/main/resources/appServer/pswdAliasNew.jsf
+++ b/appserver/admingui/common/src/main/resources/appServer/pswdAliasNew.jsf
@@ -53,7 +53,7 @@
             setPageSessionAttribute(key="edit" value="#{false}" );
         />
     </event>
-<sun:form id="propertyForm">
+<sun:form id="propertyForm" autoComplete="off">
 #include "/common/shared/alertMsg_1.inc"
     <sun:title id="propertyContentPage"  title="$resource{i18nc.pswdAliasNew.title}"  helpText="$resource{i18nc.pswdAliasNew.titleHelp}" >
         <!facet pageButtonsTop>
diff --git a/appserver/admingui/common/src/main/resources/appServer/serverInstAdminPassword.jsf b/appserver/admingui/common/src/main/resources/appServer/serverInstAdminPassword.jsf
index 28a9d3dd3ab..0bcda27fc52 100644
--- a/appserver/admingui/common/src/main/resources/appServer/serverInstAdminPassword.jsf
+++ b/appserver/admingui/common/src/main/resources/appServer/serverInstAdminPassword.jsf
@@ -58,7 +58,7 @@
         getUserInfo(Realm="#{pageSession.authRealm}", configName="#{pageSession.configName}", User="#{sessionScope.userName}", GroupList="#{pageSession.group}" );
         />
     </event>
-            <sun:form id="propertyForm">
+            <sun:form id="propertyForm" autoComplete="off">
 #include "/common/appServer/domainTabs.inc"
 #include "/common/shared/alertMsg.inc"
    <!-- Page Title -->
@@ -86,14 +86,14 @@
             <sun:staticText id="GroupList" text="#{pageSession.group}"/>
         </sun:property>
         <sun:property id="newPasswordProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18nc.domain.NewPassword}">
-            <sun:passwordField id="NewPassword" columns="$int{25}" maxLength="#{sessionScope.fieldLengths['maxLength.server.NewPassword']}" text="#{pageSession.password}" >
+            <sun:passwordField id="NewPassword" name="password" columns="$int{25}" maxLength="#{sessionScope.fieldLengths['maxLength.server.NewPassword']}" text="#{pageSession.password}" >
                  <!afterCreate
                     getClientId(component="$this{component}" clientId=>$page{ps1});
                 />
             </sun:passwordField>
         </sun:property>
         <sun:property id="confirmPasswordProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18nc.domain.ConfirmNewPassword}">
-            <sun:passwordField id="ConfirmPassword" columns="$int{25}" maxLength="#{sessionScope.fieldLengths['maxLength.server.ConfirmNewPassword']}" text="#{pageSession.confirmPassword}"   >
+            <sun:passwordField id="ConfirmPassword" name="password" columns="$int{25}" maxLength="#{sessionScope.fieldLengths['maxLength.server.ConfirmNewPassword']}" text="#{pageSession.confirmPassword}"   >
                 <!afterCreate
                     getClientId(component="$this{component}" clientId=>$page{ps2});
                 />
diff --git a/appserver/admingui/common/src/main/resources/security/realms/manageUserEdit.jsf b/appserver/admingui/common/src/main/resources/security/realms/manageUserEdit.jsf
index d91f91cf3ed..0e7e53f76d6 100644
--- a/appserver/admingui/common/src/main/resources/security/realms/manageUserEdit.jsf
+++ b/appserver/admingui/common/src/main/resources/security/realms/manageUserEdit.jsf
@@ -65,7 +65,7 @@
         }
         />
         </event>
-            <sun:form id="propertyForm">
+            <sun:form id="propertyForm" autoComplete="off">
 #include "/common/shared/alertMsg.inc"               
                 <!-- Page Title -->
                 <sun:title id="propertyContentPage" title="$resource{i18nc.manageUsers.EditPageTitle}" 
@@ -116,14 +116,14 @@
                             </sun:property>
 
                             <sun:property id="newPasswordProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18nc.manageUsers.NewPassword}">
-                                <sun:passwordField id="NewPassword" columns="$int{25}" text="#{pageSession.password}"  >
+                                <sun:passwordField id="NewPassword" name="password" columns="$int{25}" text="#{pageSession.password}"  >
                                     <!afterCreate
                                         getClientId(component="$this{component}" clientId=>$page{ps1});
                                     />
                                 </sun:passwordField>     
                             </sun:property>  
                             <sun:property id="confirmPasswordProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18nc.manageUsers.ConfirmNewPassword}">
-                                <sun:passwordField id="ConfirmPassword" columns="$int{25}" text="#{pageSession.confirmPassword}"  >
+                                <sun:passwordField id="ConfirmPassword" name="password" columns="$int{25}" text="#{pageSession.confirmPassword}"  >
                                     <!afterCreate
                                         getClientId(component="$this{component}" clientId=>$page{ps2});
                                     />
diff --git a/appserver/admingui/common/src/main/resources/security/realms/manageUserNew.jsf b/appserver/admingui/common/src/main/resources/security/realms/manageUserNew.jsf
index e19e0c95a9c..71dce904158 100644
--- a/appserver/admingui/common/src/main/resources/security/realms/manageUserNew.jsf
+++ b/appserver/admingui/common/src/main/resources/security/realms/manageUserNew.jsf
@@ -64,7 +64,7 @@
         setPageSessionAttribute(key="emptyPswdMsg", value="$resource{i18n.msg.JS.manageUser.setEmptyPassword}")
     />
      </event>
-            <sun:form id="propertyForm">
+            <sun:form id="propertyForm" autoComplete="off">
 #include "/common/shared/alertMsg.inc"                
                 <!-- Page Title -->
                 <sun:title id="propertyContentPage" title="$resource{i18nc.manageUsers.NewPageTitle}" 
@@ -114,7 +114,7 @@
                             </sun:property>
 
                             <sun:property id="newPasswordProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18nc.manageUsers.NewPassword}">
-                                <sun:passwordField id="NewPassword"  columns="$int{25}" text="#{requestScope.password}"  >
+                                <sun:passwordField id="NewPassword"  name="password" columns="$int{25}" text="#{requestScope.password}"  >
                                     <!afterCreate
                                         getClientId(component="$this{component}" clientId=>$page{ps1});
                                     />
diff --git a/appserver/admingui/common/src/main/resources/security/security.jsf b/appserver/admingui/common/src/main/resources/security/security.jsf
index 428fe104f2a..180ef6fc746 100644
--- a/appserver/admingui/common/src/main/resources/security/security.jsf
+++ b/appserver/admingui/common/src/main/resources/security/security.jsf
@@ -62,7 +62,7 @@
         setPageSessionAttribute(key="convertToFalseList" value={"auditEnabled","activateDefaultPrincipalToRoleMapping"})
         />
     </event>
-            <sun:form id="propertyForm">
+            <sun:form id="propertyForm" autoComplete="off">
 #include "/common/shared/alertMsg.inc"
 
     <sun:title id="propertyContentPage" title="$resource{i18nc.security.Security}" helpText="$resource{i18nc.security.SecurityPageHelp}">
diff --git a/appserver/admingui/common/src/main/resources/security/securityAttrs.inc b/appserver/admingui/common/src/main/resources/security/securityAttrs.inc
index ffb6bbdc89c..7122d610e02 100644
--- a/appserver/admingui/common/src/main/resources/security/securityAttrs.inc
+++ b/appserver/admingui/common/src/main/resources/security/securityAttrs.inc
@@ -69,7 +69,7 @@
             <sun:textField id="DefaultPrincipal" columns="$int{55}" maxLength="#{sessionScope.fieldLengths['maxLength.security.DefaultPrincipal']}" text="#{requestScope.principal"/>
         </sun:property>
         <sun:property id="defaultPrincipalPasswordProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18nc.security.DefaultPrincipalPassword}" helpText="$resource{i18nc.security.DefaultPrincipalPasswordHelp}">
-            <sun:passwordField id="DefaultPrincipalPassword" columns="$int{55}" maxLength="#{sessionScope.fieldLengths['maxLength.security.DefaultPrincipalPassword']}" text="#{requestScope.password"/>
+            <sun:passwordField id="DefaultPrincipalPassword" name="password" columns="$int{55}" maxLength="#{sessionScope.fieldLengths['maxLength.security.DefaultPrincipalPassword']}" text="#{requestScope.password"/>
         </sun:property>
       <sun:property id="jaccProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18nc.security.Jacc}" helpText="$resource{i18nc.security.JaccHelp}">
             <sun:dropDown id="Jacc" labels="$pageSession{jaccs}" selected="#{pageSession.valueMap['jacc']}" />
diff --git a/appserver/admingui/community-theme/src/main/resources/branding/loginform.inc b/appserver/admingui/community-theme/src/main/resources/branding/loginform.inc
index 4b0d3a400da..32887ad0aa6 100644
--- a/appserver/admingui/community-theme/src/main/resources/branding/loginform.inc
+++ b/appserver/admingui/community-theme/src/main/resources/branding/loginform.inc
@@ -51,7 +51,7 @@
             />
         </sun:image>
 <f:verbatim>
-        <form method="POST" class="form" name="loginform" action="j_security_check">
+        <form method="POST" class="form" name="loginform" action="j_security_check" autocomplete="off">
         <table role="presentation">
         <tr>
             <td><label for="Login.username" style="font-weight: bold;">$resource{i18n.common.username}</label></td>
@@ -59,7 +59,7 @@
         </tr>
         <tr>
             <td><label for="Login.password" style="font-weight: bold;">$resource{i18n.common.password}</label>
-            <td><input type="password" name="j_password" id="Login.password" tabindex="2">
+            <td><input type="password" name="j_password" id="Login.password" tabindex="2" autocomplete="new-password">
         <tr>
             <td colspan="2" align="center">
                 <input type="submit" class="Btn1"
diff --git a/appserver/admingui/jca/src/main/resources/connectorSecurityMapAttr.inc b/appserver/admingui/jca/src/main/resources/connectorSecurityMapAttr.inc
index d1a4d771aeb..84df2fdc37d 100644
--- a/appserver/admingui/jca/src/main/resources/connectorSecurityMapAttr.inc
+++ b/appserver/admingui/jca/src/main/resources/connectorSecurityMapAttr.inc
@@ -99,7 +99,7 @@
             <sun:textField id="userNameEdit" disabled="#{edit}" styleClass="required" columns="$int{55}" maxLength="#{sessionScope.fieldLengths['maxLength.connectorSecurityMap.userName']}" text="#{pageSession.valueMap['mappedUserName']}" required="#{true}" />
         </sun:property>
         <sun:property id="passwordEdit" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18njca.connectorSecurityMap.password}">
-            <sun:passwordField id="passwordEdit" columns="$int{55}" text="#{pageSession.valueMap['mappedPassword']}"/>
+            <sun:passwordField id="passwordEdit" name="password" columns="$int{55}" text="#{pageSession.valueMap['mappedPassword']}"/>
         </sun:property>
     </sun:propertySheetSection>
 
diff --git a/appserver/admingui/jca/src/main/resources/connectorSecurityMapEdit.jsf b/appserver/admingui/jca/src/main/resources/connectorSecurityMapEdit.jsf
index 138ee20fe23..813c535e4b1 100644
--- a/appserver/admingui/jca/src/main/resources/connectorSecurityMapEdit.jsf
+++ b/appserver/admingui/jca/src/main/resources/connectorSecurityMapEdit.jsf
@@ -96,7 +96,7 @@
 
     />
     </event>
-            <sun:form id="propertyForm">
+            <sun:form id="propertyForm" autoComplete="off">
 #include "/jca/connectorConnectionPoolTabs.inc"
 #include "/common/shared/alertMsg_1.inc"
 
diff --git a/appserver/admingui/jca/src/main/resources/connectorSecurityMapNew.jsf b/appserver/admingui/jca/src/main/resources/connectorSecurityMapNew.jsf
index e8da70fc49f..6be76661fc1 100644
--- a/appserver/admingui/jca/src/main/resources/connectorSecurityMapNew.jsf
+++ b/appserver/admingui/jca/src/main/resources/connectorSecurityMapNew.jsf
@@ -69,7 +69,7 @@
 
     />
     </event>
-            <sun:form id="propertyForm">
+            <sun:form id="propertyForm" autoComplete="off">
 #include "/jca/connectorConnectionPoolTabs.inc"
 #include "/common/shared/alertMsg_1.inc"
 
diff --git a/appserver/admingui/jms-plugin/src/main/resources/configureJmsClusterSheet.inc b/appserver/admingui/jms-plugin/src/main/resources/configureJmsClusterSheet.inc
index c4c3901d5fb..8cc2ab0c5ba 100644
--- a/appserver/admingui/jms-plugin/src/main/resources/configureJmsClusterSheet.inc
+++ b/appserver/admingui/jms-plugin/src/main/resources/configureJmsClusterSheet.inc
@@ -132,7 +132,7 @@
 
         <sun:property id="PswdTextProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" styleClass="__database"
             label="$resource{i18ncs.cluster.jms.dbUserPassword}" helpText="$resource{i18ncs.cluster.jms.dbUserPasswordHelp}" >
-            <sun:passwordField id="NewPassword" text="#{pageSession.pswdText}" columns="$int{25}" 
+            <sun:passwordField id="NewPassword" name="password" text="#{pageSession.pswdText}" columns="$int{25}"
                 maxLength="#{sessionScope.fieldLengths['maxLength.server.NewPassword']}" />
         </sun:property>
 
diff --git a/appserver/admingui/jms-plugin/src/main/resources/jmsHost.inc b/appserver/admingui/jms-plugin/src/main/resources/jmsHost.inc
index f10e974bd7f..53bb7505903 100644
--- a/appserver/admingui/jms-plugin/src/main/resources/jmsHost.inc
+++ b/appserver/admingui/jms-plugin/src/main/resources/jmsHost.inc
@@ -99,14 +99,14 @@
             <sun:textField id="AdminUser" columns="$int{25}" maxLength="#{sessionScope.fieldLengths['maxLength.edJmsHost.adminUser']}"  text="#{pageSession.valueMap['adminUserName']}" styleClass="required"  required="#{true}" />
         </sun:property>
         <sun:property id="newPasswordProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18njms.edJmsHost.adminPwdLabel}" helpText="$resource{i18njms.edJmsHost.adminPwdHelp}">
-        <sun:passwordField id="NewPassword" columns="$int{25}" maxLength="#{sessionScope.fieldLengths['maxLength.edJmsHost.adminPwd']}"  text="#{pageSession.valueMap['adminPassword']}" styleClass="required"  required="#{true}">
+        <sun:passwordField id="NewPassword" name="password" columns="$int{25}" maxLength="#{sessionScope.fieldLengths['maxLength.edJmsHost.adminPwd']}"  text="#{pageSession.valueMap['adminPassword']}" styleClass="required"  required="#{true}">
              <!afterCreate
                 getClientId(component="$this{component}" clientId=>$page{ps1});
             />
         </sun:passwordField>
         </sun:property>
         <sun:property id="confirmPasswordProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18njms.edJmsHost.ConfirmNewPassword}">
-            <sun:passwordField id="ConfirmPassword"  columns="$int{25}" maxLength="#{sessionScope.fieldLengths['maxLength.server.ConfirmNewPassword']}"  text="#{pageSession.valueMap['adminPassword']}" styleClass="required" required="#{true}"  >
+            <sun:passwordField id="ConfirmPassword" name="password" columns="$int{25}" maxLength="#{sessionScope.fieldLengths['maxLength.server.ConfirmNewPassword']}"  text="#{pageSession.valueMap['adminPassword']}" styleClass="required" required="#{true}"  >
                 <!afterCreate
                     getClientId(component="$this{component}" clientId=>$page{ps2});
                 />
diff --git a/appserver/admingui/jms-plugin/src/main/resources/jmsHostEdit.jsf b/appserver/admingui/jms-plugin/src/main/resources/jmsHostEdit.jsf
index 978b3e01243..2c50e26e1b6 100644
--- a/appserver/admingui/jms-plugin/src/main/resources/jmsHostEdit.jsf
+++ b/appserver/admingui/jms-plugin/src/main/resources/jmsHostEdit.jsf
@@ -63,7 +63,7 @@
             gf.getEntityAttrs(endpoint="#{pageSession.selfUrl}.json", valueMap="#{pageSession.valueMap}");
         />
     </event>
-    <sun:form id="propertyForm">
+    <sun:form id="propertyForm" autoComplete="off">
 #include "/jms/jmsHost.inc"
         <sun:hidden id="helpKey" value="$resource{helpjms.jmsHostEdit}" />
     </sun:form>
diff --git a/appserver/admingui/jms-plugin/src/main/resources/jmsHostNew.jsf b/appserver/admingui/jms-plugin/src/main/resources/jmsHostNew.jsf
index ebdb6ed8cec..3cb7abd2f01 100644
--- a/appserver/admingui/jms-plugin/src/main/resources/jmsHostNew.jsf
+++ b/appserver/admingui/jms-plugin/src/main/resources/jmsHostNew.jsf
@@ -61,7 +61,7 @@
             gf.getDefaultValues(endpoint="#{pageSession.selfUrl}", valueMap="#{pageSession.valueMap}");
         />
     </event>
-    <sun:form id="propertyForm">
+    <sun:form id="propertyForm" autoComplete="off">
 #include "/jms/jmsHost.inc"
         <sun:hidden id="helpKey" value="$resource{helpjms.jmsHostNew}" />
     </sun:form>