REP-77 - Validate service name in service list

Because I'm stupid. Fixing