Refactoring: Moving user forms into user