Fix current user, add user templates for new HTML