Registration validation improved