Feature/tw 13 user status