diff --git a/applications/marketing/webapp/sfa/WEB-INF/controller.xml b/applications/marketing/webapp/sfa/WEB-INF/controller.xml
index 9585626efe..8af21c069f 100644
--- a/applications/marketing/webapp/sfa/WEB-INF/controller.xml
+++ b/applications/marketing/webapp/sfa/WEB-INF/controller.xml
@@ -64,6 +64,14 @@ under the License.
+
+
+
+
+
+
+
+
@@ -84,6 +92,10 @@ under the License.
+
+
+
+
@@ -159,6 +171,10 @@ under the License.
+
+
+
+
@@ -284,6 +300,10 @@ under the License.
+
+
+
+
diff --git a/applications/marketing/widget/sfa/CommonScreens.xml b/applications/marketing/widget/sfa/CommonScreens.xml
index 5c9ae28101..56a67febab 100644
--- a/applications/marketing/widget/sfa/CommonScreens.xml
+++ b/applications/marketing/widget/sfa/CommonScreens.xml
@@ -347,6 +347,304 @@ under the License.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/applications/marketing/widget/sfa/forms/AccountForms.xml b/applications/marketing/widget/sfa/forms/AccountForms.xml
index ff244006dc..61cea17194 100644
--- a/applications/marketing/widget/sfa/forms/AccountForms.xml
+++ b/applications/marketing/widget/sfa/forms/AccountForms.xml
@@ -137,10 +137,24 @@ under the License.
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/applications/party/groovyScripts/party/SetRoleVars.groovy b/applications/party/groovyScripts/party/SetRoleVars.groovy
index 852812b3b3..db7eea9a69 100644
--- a/applications/party/groovyScripts/party/SetRoleVars.groovy
+++ b/applications/party/groovyScripts/party/SetRoleVars.groovy
@@ -32,7 +32,7 @@ if (roleTypeAndParty) {
context.partyId = parameters.partyId
}
} else if ("ACCOUNT_LEAD".equals(roleTypeId)) {
- context.leadDescription = roleTypeAndParty.description
+ context.accountLeadDescription = roleTypeAndParty.description
partyRelationships = from("PartyRelationship").where("partyIdFrom", parameters.partyId, "roleTypeIdFrom", "ACCOUNT_LEAD", "roleTypeIdTo", "LEAD", "partyRelationshipTypeId", "EMPLOYMENT").filterByDate().queryFirst()
if (partyRelationships) {
context.partyGroupId = parameters.partyId
diff --git a/applications/party/template/party/profileblocks/Attributes.ftl b/applications/party/template/party/profileblocks/Attributes.ftl
index 3e88b77994..1fb23436b4 100644
--- a/applications/party/template/party/profileblocks/Attributes.ftl
+++ b/applications/party/template/party/profileblocks/Attributes.ftl
@@ -22,7 +22,7 @@ under the License.
diff --git a/applications/party/template/party/profileblocks/Notes.ftl b/applications/party/template/party/profileblocks/Notes.ftl
index 2ba16587c4..d7d0f21cd6 100644
--- a/applications/party/template/party/profileblocks/Notes.ftl
+++ b/applications/party/template/party/profileblocks/Notes.ftl
@@ -22,7 +22,7 @@ under the License.
diff --git a/applications/party/template/party/profileblocks/UserLogin.ftl b/applications/party/template/party/profileblocks/UserLogin.ftl
index 8e63d1f20b..bee922f209 100644
--- a/applications/party/template/party/profileblocks/UserLogin.ftl
+++ b/applications/party/template/party/profileblocks/UserLogin.ftl
@@ -22,7 +22,7 @@ under the License.
diff --git a/applications/party/widget/partymgr/PartyMenus.xml b/applications/party/widget/partymgr/PartyMenus.xml
index 5cee048b37..983e2cd5ff 100644
--- a/applications/party/widget/partymgr/PartyMenus.xml
+++ b/applications/party/widget/partymgr/PartyMenus.xml
@@ -276,6 +276,7 @@
+
@@ -320,6 +321,7 @@
+