Fix issue #17: Use correct variable for email
Fix issue #18: Replace eval() with call_user_func()