Refactoring user account