Fixes to user CP.