only let the user change the recovery admin settings if a key passwords was entered.
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption