Add back password check