Add Encrypt Data option for non-primary users
Some minor fixes and code cleanup