Re-Added Auth
Temporarily disabled for design branch