Restore logout. Resolves #19