added password control