reformat code
fix password change when files_encryption app is disabled
fixed typo