Updated password scheme