Added support for long passwords