Fix styling issue and check for password if it is 0. #2517