Change registration validation to use Message()

Also improved Message()