Slight changes to please_logout
Fixed merge conflict. Hopefully for the better