When changing the master password users should be able to choose a keyfile. We should also offer a way to generate a keyfile.