fix dashboard error when userpref not set
Merge branch 'develop' into 1.x-stable