Added username matching, partial password matching