Work in progress: handling new states for validation
Implement locked, enabled, disabled validation according to server rules in client