Fixed the Long-Waited bug for non-passworded OS