added password fields, removed unnecessary imports