Better user management. Now using actual generated users