Few changes to registration validation