changed UI - password support