Bug fix: wrong service client creation
Authored by: ozzy-ext 2012-10-08
Parent: [r537]
Child: [r539]