REP-77 - Validate service name in service list

Yeah that definitely makes more sense. Fixing it now.