updated username/password to convention format