Add force mode and fix auth