diff --git a/app/controllers/miq_ae_class_controller.rb b/app/controllers/miq_ae_class_controller.rb
index 16bbfa77798..bb7da5ba57c 100644
--- a/app/controllers/miq_ae_class_controller.rb
+++ b/app/controllers/miq_ae_class_controller.rb
@@ -2318,9 +2318,7 @@ def fields_get_form_vars
             fld[field] = params[var_name.to_sym] if params[var_name.to_sym]
           elsif field == "default_value"
             fld[field] = params[field_name] if params[field_name]
-            if fld['datatype'] == 'password'
-              fld[field] = params["fields_password_value_#{i}".to_sym] if params["fields_password_value_#{i}".to_sym]
-            end
+            fld[field] = params["fields_password_value_#{i}".to_sym] if params["fields_password_value_#{i}".to_sym]
           elsif params[field_name]
             fld[field] = params[field_name]
           end