Changed key derivation function to scrypt, added second password field