Revert "Separate Change Encryption Password Entry (2 of 2)"

This reverts commit 1fa321e08b8a1c315c83d0cea4ed786da49fb0f6.