1 files changed, 9 insertions, 3 deletions
diff --git a/install/ui/entitle.js b/install/ui/entitle.js
index 1b434d3fb..193468c2a 100644
--- a/install/ui/entitle.js
+++ b/install/ui/entitle.js
@@ -86,7 +86,7 @@ IPA.entity_factories.entitle = function() {
                 },
                 {
                     name: 'password',
-                    label: IPA.get_method_param('entitle_register', 'password').label,
+                    label: IPA.get_method_option('entitle_register', 'password').label,
                     type: 'password',
                     undo: false
                 }
@@ -114,7 +114,8 @@ IPA.entity_factories.entitle = function() {
                 {
                     name: 'quantity',
                     label: 'Quantity',
-                    undo: false
+                    undo: false,
+                    metadata: IPA.get_method_arg('entitle_consume', 'quantity')
                 }
             ]
         }).
@@ -261,7 +262,6 @@ IPA.entitle.search_facet = function(spec) {
 
     that.setup = function(container) {
 
-
         that.search_facet_setup(container);
 
         var buttons = that.entity_header.buttons;
@@ -408,6 +408,7 @@ IPA.entitle.certificate_column = function(spec) {
     var that = IPA.column(spec);
 
     that.setup = function(container, record) {
+
         container.empty();
 
         var certificate = record[that.name];
@@ -527,6 +528,11 @@ IPA.entitle.consume_dialog = function(spec) {
     var that = IPA.dialog(spec);
 
     that.add_button('Consume', function() {
+
+        if (!that.is_valid()) {
+            return;
+        }
+
         var record = {};
         that.save(record);