Some password fixes