Improve PasswordableBehavior for >=2.5