Small changes to encryptform