added password / username option