brought registration & logout in line with base