Updated password handling