Minor fix for Signout & Cancel