Fix/passwords not fillable on 4.0 branch