Fix various crap
Handle reauthentication attempt when already authenticated