1 files changed, 14 insertions, 7 deletions

diff --git a/install/ui/user.js b/install/ui/user.js
index 63c2ec4c8..8a8f9443d 100644
--- a/install/ui/user.js
+++ b/install/ui/user.js
@@ -26,6 +26,11 @@
 
 IPA.entity_factories.user = function() {
 
+    var link = true;
+    if (IPA.nav && IPA.nav.name == 'self-service') {
+        link = false;
+    }
+
     var builder = IPA.entity_builder();
 
     builder.
@@ -90,17 +95,22 @@ IPA.entity_factories.user = function() {
             }]}).
         association_facet({
             name: 'memberof_group',
-            associator: IPA.serial_associator
+            associator: IPA.serial_associator,
+            link: link
         }).
         association_facet({
             name: 'memberof_netgroup',
-            associator: IPA.serial_associator
+            associator: IPA.serial_associator,
+            link: link
         }).
         association_facet({
             name: 'memberof_role',
-            associator: IPA.serial_associator
+            associator: IPA.serial_associator,
+            link: link
+        }).
+        standard_association_facets({
+            link: link
         }).
-        standard_association_facets().
         adder_dialog({
             fields: ['uid', 'givenname', 'sn']
         });
@@ -108,9 +118,6 @@ IPA.entity_factories.user = function() {
     return builder.build();
 };
 
-/* ATTRIBUTE CALLBACKS */
-
-
 IPA.user_status_widget = function(spec) {
 
     spec = spec || {};