Double check handling of password