Re-Added some defaults for encryption