Fix prepopulate from web service bug