5.x User Logins - Bug fix