BC-1550 #comment fixed for login + filter