Fixes on passwordfield
Fixes on passwordfield