Improved Cipher handling of empty passwords