[#975562] Fixes for new login