FIXED: small bugs with 2.3
MODIFIED: show encrypted to default false