Fixes registered user flow. Moved some methods to minify DI.