fix popup + logout