Merge pull request #8 from EnginesOS/master

fix field issues when not a password field
Merge pull request #9 from EnginesOS/current

Merge pull request #8 from EnginesOS/master