Fixes for no login