Cleaned up auto auth.

Still some issues with roles.