FIX (Login): Add missing changes to the last commit e65ac5a