CFK-81: Use e-mail address instead