masterCperello/usercorner fixes