diff --git a/MVMCoreUI/FormUIHelpers/FormValidator.swift b/MVMCoreUI/FormUIHelpers/FormValidator.swift
index fe23da84..d11e4847 100644
--- a/MVMCoreUI/FormUIHelpers/FormValidator.swift
+++ b/MVMCoreUI/FormUIHelpers/FormValidator.swift
@@ -49,16 +49,16 @@ import MVMCore
     
     public func enableByValidation() {
         for molecule in enableDisableMolecules {
-            if let requiredFields = molecule.requiredGroups?(), requiredFields.count > 0 {
-                enableWithGroups(requiredFields, molecule)
-            } else {
-                enableIgnoreGroupName(molecule)
+            var requiredFields = molecule.requiredGroups?() ?? [dummyGroupName]
+            if requiredFields.count == 0 {
+                requiredFields = [dummyGroupName]
             }
+            enableWithGroups(requiredFields, molecule)
         }
     }
     
     public func enableWithGroups(_ requiredGroupList: [String], _ enableDisableMolecule: FormValidationEnableDisableProtocol) {
-        
+
         var groupValidityMap: [String: Bool] = [:]
         for molecule in fieldMolecules {
             let valid = molecule.isValidField()
@@ -66,9 +66,9 @@ import MVMCore
             groupValidityMap[groupName] = valid && (groupValidityMap[groupName] ?? true)
         }
         
-        var valid = false
+        var valid = true
         for groupName in requiredGroupList {
-            valid = groupValidityMap[groupName] ?? false
+            valid = valid && groupValidityMap[groupName] ?? false
         }
         enableDisableMolecule.enableField?(valid)
     }