fixed wizard (user registration service options)
Merge remote-tracking branch 'origin/ribbons' into ribbons