replace old logout with working; close #34