Password instantiation class fix