Fix save as when encryption is turned on

Improve commit 03831143604 which prevents saving under a different name
when the encryption is globally turned on.