1 files changed, 12 insertions, 4 deletions

diff --git a/install/ui/entity.js b/install/ui/entity.js
index 4db58465d..23f792d1e 100644
--- a/install/ui/entity.js
+++ b/install/ui/entity.js
@@ -64,6 +64,9 @@ IPA.facet = function (spec) {
     };
 
     function init() {
+
+        that.entity = IPA.get_entity(that.entity_name);
+
         for (var i=0; i<that.dialogs.length; i++){
             var dialog = that.dialogs[i];
             dialog.entity_name = that._entity_name;
@@ -220,7 +223,6 @@ IPA.entity = function (spec) {
 
     that.standard_associations = that.create_association_facets;
 
-
     that.init = function() {
 
         if (!that.label) {
@@ -576,8 +578,14 @@ IPA.entity_builder = function(){
         }
     }
 
-    that.entity = function(name){
-        entity = IPA.entity({name: name});
+    that.entity = function(spec) {
+        if (spec instanceof Object){
+            var factory = spec.factory || IPA.entity;
+            entity = factory(spec);
+        } else {
+            var name = spec;
+            entity = IPA.entity({name: name});
+        }
         return that;
     };
 
@@ -588,7 +596,7 @@ IPA.entity_builder = function(){
         } else {
             dialog = IPA.dialog(spec);
         }
-        facet.dialog(dialog);
+        entity.dialog(dialog);
         return that;
     };