Fixed logout and email actions