#25: fix the session locking for old users