Encryption improved error messages 4617

Improved error messages, to distinguish between the case where the password was changed from outside and where the app was re-enabled during the session.

Discussed in issue #4617