From 5d0f627ee2ebacf71fc95484ef11d9221b7d809c Mon Sep 17 00:00:00 2001
From: Steve Millidge <steve.millidge@payara.fish>
Date: Sat, 16 Mar 2019 20:02:29 +0000
Subject: [PATCH] PAYARA-3686 unable to save the Default Principal in the
 Sercurity Service page of the admin console

---
 .../common/src/main/resources/security/securityAttrs.inc      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appserver/admingui/common/src/main/resources/security/securityAttrs.inc b/appserver/admingui/common/src/main/resources/security/securityAttrs.inc
index 603fc08f567..f506d5cc30a 100644
--- a/appserver/admingui/common/src/main/resources/security/securityAttrs.inc
+++ b/appserver/admingui/common/src/main/resources/security/securityAttrs.inc
@@ -66,10 +66,10 @@
             />
         </sun:property>
         <sun:property id="defaultPrincipalProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18nc.security.DefaultPrincipal}" helpText="$resource{i18nc.security.DefaultPrincipalHelp}">
-            <sun:textField id="DefaultPrincipal" columns="$int{55}" maxLength="#{sessionScope.fieldLengths['maxLength.security.DefaultPrincipal']}" text="#{requestScope.principal}"/>
+            <sun:textField id="DefaultPrincipal" columns="$int{55}" maxLength="#{sessionScope.fieldLengths['maxLength.security.DefaultPrincipal']}" text="#{pageSession.valueMap['defaultPrincipal']}"/>
         </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" name="password" 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="#{pageSession.valueMap['defaultPrincipalPassword']}"/>
         </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']}" />