Fixes to fallback mode user authentication