add logout back with fix