diff --git a/murano-apps/OpenLDAP2/package/Classes/OpenLDAP.yaml b/murano-apps/OpenLDAP2/package/Classes/OpenLDAP.yaml
index 47a2d1b..258b9a0 100644
--- a/murano-apps/OpenLDAP2/package/Classes/OpenLDAP.yaml
+++ b/murano-apps/OpenLDAP2/package/Classes/OpenLDAP.yaml
@@ -16,11 +16,11 @@ Properties:
   name:
     Contract: $.string().notNull()
   domain:
-    Contract: $.string()
+    Contract: $.string().notNull()
   ldapUser:
-    Contract: $.string()
+    Contract: $.string().notNull()
   ldapPass:
-    Contract: $.string()
+    Contract: $.string().notNull()
 
 Methods:
   initialize:
@@ -56,11 +56,8 @@ Methods:
           - $.instance.agent.call($template, $resources)
           - $._environment.reporter.report($this, format('OpenLDAP is available at {0}', $.instance.floatingIpAddress))
 
-          - If: $.domain != '' and $.domain != null
-            Then:
-              - If: $.ldapUser != '' and $.ldapUser != null
-                Then:
-                  - $.configureOpenLDAPUser($.domain, $.ldapUser, $.ldapPass)
+          - $.configureOpenLDAPUser($.domain, $.ldapUser, $.ldapPass)
+
           - $.setAttr(deployed, true)
           - $._environment.reporter.report($this, 'OpenLDAP is deployed!')
 
diff --git a/murano-apps/OpenLDAP2/package/UI/ui.yaml b/murano-apps/OpenLDAP2/package/UI/ui.yaml
index 04bbb5a..2a34566 100644
--- a/murano-apps/OpenLDAP2/package/UI/ui.yaml
+++ b/murano-apps/OpenLDAP2/package/UI/ui.yaml
@@ -31,21 +31,18 @@ Forms:
           type: string
           label: Domain
           initial: domain.tld
-          required: false
           descriptionTitle: Domain
           description: >-
             Please, provide domain for the OpenLDAP instance
         - name: ldapUser
           type: string
           label: Username
-          required: false
           descriptionTitle: LDAP User
           description: >-
             Please, provide username
         - name: ldapPass
           type: password
           label: Password
-          required: false
           descriptionTitle: LDAP Password
           description: >-
             Please, provide password