diff --git a/MVMCoreUI/FormUIHelpers/FormValidator.swift b/MVMCoreUI/FormUIHelpers/FormValidator.swift
index 7f689dd8..77c52249 100644
--- a/MVMCoreUI/FormUIHelpers/FormValidator.swift
+++ b/MVMCoreUI/FormUIHelpers/FormValidator.swift
@@ -64,6 +64,9 @@ import MVMCore
             let groupName = molecule.formFieldGroupName() ?? dummyGroupName
             if requiredGroupSet.contains(groupName) {
                 valid = valid && molecule.isValidField()
+                if valid == false {
+                    break
+                }
             }
         }
         enableDisableMolecule.enableField?(valid)
diff --git a/MVMCoreUI/Molecules/RadioButtonLabel.swift b/MVMCoreUI/Molecules/RadioButtonLabel.swift
index 5d70b7e4..e889b4f2 100644
--- a/MVMCoreUI/Molecules/RadioButtonLabel.swift
+++ b/MVMCoreUI/Molecules/RadioButtonLabel.swift
@@ -27,6 +27,12 @@ import UIKit
         super.init(coder: aDecoder)
     }
 
+    public override func updateView(_ size: CGFloat) {
+        super.updateView(size)
+        radioButton.updateView(size)
+        label.updateView(size)
+    }
+    
     open override func setupView() {
         super.setupView()
         guard subviews.count == 0 else {
@@ -73,6 +79,7 @@ extension RadioButtonLabel {
     }
 
     public override func reset() {
+        super.reset()
         radioButton.reset()
         label.reset()
     }