added password row + small enhancements