Merge "Fix AuthController crash"