Extract and enhance the regexps
Extract and enhance the regexps

Make sure the regexps match correctly entries with dashes in the login
name

user890104/fauna,initLab/fauna,initLab/fauna,user890104/fauna,user890104/fauna,initLab/fauna