allow email or hash, bug fixes