Password field enhancements

Ready for review