updated for registration
adding email compatibility
added