Fix for password encoding issue