Merge "User Page issue"