Fixes from CR
Fixes from CR - removing logout when in VE mode