Enables the encryption_type selection using the configuration + Fixes the missing return.