Added account (username) support