Remove manual user creation - Continued