Removed hardcoded email, added JText