Refactoring the Online user plugin