[Improved] Password field support