Fixes for pluggable userprofile