User and account refactoring