Fix build
Fix login