Feature/mark user