Fixes to the user data page

Change-Id: If351a815702aa721074a8232abb853dbc46963dd