Added possibility to enable/disable password