consolidating email confirmation and adding logout