Fixed the null password issue