diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.jelly b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.jelly
index c6b458cecfe9..8e68cf8481a1 100644
--- a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.jelly
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.jelly
@@ -28,7 +28,7 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:f="/lib/form">
     <l:layout permission="${app.ADMINISTER}" title="${%title}">
-        <st:include page="sidepanel.jelly" it="${it.targetUser}" />
+        <st:include page="sidepanel.jelly" it="${it.targetUser}" from="${it}" />
         <l:main-panel>
             <f:form method="post" action="configSubmit" name="config" class="jenkins-form">
                 <h1>
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyDescriptor/sidepanel.jelly b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAction/sidepanel.jelly
similarity index 100%
rename from core/src/main/resources/hudson/model/userproperty/UserPropertyDescriptor/sidepanel.jelly
rename to core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAction/sidepanel.jelly
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAppearanceAction/index.jelly b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAppearanceAction/index.jelly
index 0d90ad4b2d76..5c6dca916b0e 100644
--- a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAppearanceAction/index.jelly
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAppearanceAction/index.jelly
@@ -28,7 +28,7 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:f="/lib/form">
     <l:layout permission="${app.ADMINISTER}" title="${%title}">
-        <st:include page="sidepanel.jelly" it="${it.targetUser}" />
+        <st:include page="sidepanel.jelly" it="${it.targetUser}" from="${it}" />
         <l:main-panel>
             <f:form method="post" action="configSubmit" name="config">
                 <h1>
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryExperimentalAction/index.jelly b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryExperimentalAction/index.jelly
index 0d90ad4b2d76..5c6dca916b0e 100644
--- a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryExperimentalAction/index.jelly
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryExperimentalAction/index.jelly
@@ -28,7 +28,7 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:f="/lib/form">
     <l:layout permission="${app.ADMINISTER}" title="${%title}">
-        <st:include page="sidepanel.jelly" it="${it.targetUser}" />
+        <st:include page="sidepanel.jelly" it="${it.targetUser}" from="${it}" />
         <l:main-panel>
             <f:form method="post" action="configSubmit" name="config">
                 <h1>
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryPreferencesAction/index.jelly b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryPreferencesAction/index.jelly
index 6971e5abf8d0..158c4cfe2f2c 100644
--- a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryPreferencesAction/index.jelly
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryPreferencesAction/index.jelly
@@ -28,7 +28,7 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:f="/lib/form">
     <l:layout permission="${app.ADMINISTER}" title="${%title}">
-        <st:include page="sidepanel.jelly" it="${it.targetUser}" />
+        <st:include page="sidepanel.jelly" it="${it.targetUser}" from="${it}" />
         <l:main-panel>
             <f:form method="post" action="configSubmit" name="config">
                 <h1>
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategorySecurityAction/index.jelly b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategorySecurityAction/index.jelly
index 0d90501fbbb0..6bc73f46e88e 100644
--- a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategorySecurityAction/index.jelly
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategorySecurityAction/index.jelly
@@ -28,7 +28,7 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:f="/lib/form">
     <l:layout permission="${app.ADMINISTER}" title="${%title}">
-        <st:include page="sidepanel.jelly" it="${it.targetUser}" />
+        <st:include page="sidepanel.jelly" it="${it.targetUser}" from="${it}" />
         <l:main-panel>
             <f:form method="post" action="configSubmit" name="config">
                 <h1>