Crude logout problem fix