final changes to disable password function