Refactor active user