merge

... help portlet for each user, variable name fix